database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-02-26 23:35:58 +02:00
parent 045ac4b84b 8df5705434
commit 56d0a23cd4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_show.cc
View File

@ -294,6 +294,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
field_list.push_back(item=new Item_empty_string("Create_options",255)); field_list.push_back(item=new Item_empty_string("Create_options",255));
item->maybe_null=1; item->maybe_null=1;
field_list.push_back(item=new Item_empty_string("Comment",80)); field_list.push_back(item=new Item_empty_string("Comment",80));
item->maybe_null=1;
if (send_fields(thd,field_list,1)) if (send_fields(thd,field_list,1))
DBUG_RETURN(1); DBUG_RETURN(1);
@ -312,7 +313,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
casedn_str(file_name); casedn_str(file_name);
if (!(table = open_ltable(thd, &table_list, TL_READ))) if (!(table = open_ltable(thd, &table_list, TL_READ)))
{ {
for (uint i=0 ; i < field_list.elements ; i++) for (uint i=2 ; i < field_list.elements ; i++)
net_store_null(packet); net_store_null(packet);
net_store_data(packet,convert, thd->net.last_error); net_store_data(packet,convert, thd->net.last_error);
thd->net.last_error[0]=0; thd->net.last_error[0]=0;