Merge mysql.com:/home/timka/mysql/src/5.0-virgin

into mysql.com:/home/timka/mysql/src/5.0-1724

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

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
 

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"

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);