database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge with 4.0

Browse Source 
mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/item.h:
  merge (use local copy)
sql/sql_show.cc:
  merge
This commit is contained in:
unknown
2003-02-27 03:49:26 +02:00
parent 669cbe6e5f 3f9ea80268
commit e943ca1fc3
6 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_show.cc
View File

@@ -512,6 +512,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));
item->maybe_null=1;
field_list.push_back(item=new Item_empty_string("Comment",80));
item->maybe_null=1;
if (protocol->send_fields(&field_list,1))
DBUG_RETURN(1);
@@ -530,7 +531,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
my_casedn_str(files_charset_info, file_name);
if (!(table = open_ltable(thd, &table_list, TL_READ)))
{
for (uint i=1 ; i < field_list.elements-1 ; i++)
for (uint i=2 ; i < field_list.elements ; i++)
protocol->store_null();
// Send error to Comment field
protocol->store(thd->net.last_error);