From 748d7ce13a00629e28ef0d25e5c0ebbe883f4c8f Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Tue, 12 Oct 2004 00:45:52 +0300
Subject: [PATCH 1/4] column name changd

---
 mysql-test/r/view.result | 2 +-
 sql/sql_show.cc          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index d5fdc668d61..a401a56aa34 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -139,7 +139,7 @@ v4
 v5
 v6
 show full tables;
-Tables_in_test	table_type
+Tables_in_test	Table_type
 t1	BASE TABLE
 v1	VIEW
 v2	VIEW
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 14bef9d2236..968058f0cfc 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -160,7 +160,7 @@ int mysqld_show_tables(THD *thd, const char *db, const char *wild,
   len= FN_LEN - len;
   field_list.push_back(field);
   if (show_type)
-    field_list.push_back(new Item_empty_string("table_type", 10));
+    field_list.push_back(new Item_empty_string("Table_type", 10));
   if (protocol->send_fields(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_RETURN(1);

From 67e6fba55d728a399b041649797db1a965e65731 Mon Sep 17 00:00:00 2001
From: "petr@mysql.com" <>
Date: Tue, 12 Oct 2004 14:53:32 +0400
Subject: [PATCH 2/4] fixed typo caused autobuild failure with "make dist"

---
 server-tools/instance-manager/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 46e3700cf5f..731c8503831 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -11,7 +11,7 @@ liboptions_a_CPPFLAGS= $(CPPFLAGS) \
 	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
 	-DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock"
 
-liboptions_a_SOURCES= otpions.h options.cc
+liboptions_a_SOURCES= options.h options.cc
 
 bin_PROGRAMS = mysqlmanager
 

From 10b327dc4af7f2e49c57c47761dcb5c4488758a3 Mon Sep 17 00:00:00 2001
From: "petr@mysql.com" <>
Date: Tue, 12 Oct 2004 16:28:34 +0400
Subject: [PATCH 3/4] Portability fix (FreeBSD)

---
 server-tools/instance-manager/manager.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index 06e181d52d5..20f3c00762e 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -18,6 +18,8 @@
 
 #include <my_global.h>
 #include <signal.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "thread_repository.h"
 #include "listener.h"

From 8be264691d7dd246c1dcee9edfa26e298467cf18 Mon Sep 17 00:00:00 2001
From: "petr@mysql.com" <>
Date: Tue, 12 Oct 2004 16:35:15 +0400
Subject: [PATCH 4/4] Fix for the previous commit. I've added includes to the
 wrong file :(

---
 server-tools/instance-manager/manager.cc      | 2 --
 server-tools/instance-manager/mysqlmanager.cc | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index 20f3c00762e..06e181d52d5 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -18,8 +18,6 @@
 
 #include <my_global.h>
 #include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #include "thread_repository.h"
 #include "listener.h"
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc
index cab7f5fd8ed..0ec7e043ed5 100644
--- a/server-tools/instance-manager/mysqlmanager.cc
+++ b/server-tools/instance-manager/mysqlmanager.cc
@@ -19,6 +19,8 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "manager.h"
 #include "options.h"