mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/timka/mysql/src/5.0-1724
This commit is contained in:
timour@mysql.com 2004-10-12 17:00:06 +03:00
commit be1d522dc2
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/view.result
View file

@ -139,7 +139,7 @@ v4
v5 v5
v6 v6
show full tables; show full tables;
Tables_in_test table_type Tables_in_test Table_type
t1 BASE TABLE t1 BASE TABLE
v1 VIEW v1 VIEW
v2 VIEW v2 VIEW

2
server-tools/instance-manager/Makefile.am
View file

@ -11,7 +11,7 @@ liboptions_a_CPPFLAGS= $(CPPFLAGS) \
-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
-DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" -DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock"
liboptions_a_SOURCES= otpions.h options.cc liboptions_a_SOURCES= options.h options.cc
bin_PROGRAMS = mysqlmanager bin_PROGRAMS = mysqlmanager

2
server-tools/instance-manager/mysqlmanager.cc
View file

@ -19,6 +19,8 @@
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "manager.h" #include "manager.h"
#include "options.h" #include "options.h"

2
sql/sql_show.cc
View file

@ -160,7 +160,7 @@ int mysqld_show_tables(THD *thd, const char *db, const char *wild,
len= FN_LEN - len; len= FN_LEN - len;
field_list.push_back(field); field_list.push_back(field);
if (show_type) 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, if (protocol->send_fields(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
DBUG_RETURN(1); DBUG_RETURN(1);