diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 23:35:58 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 23:35:58 +0200 |
| commit | 8c3efbc32aecc8c14e07fa71a884de96dfe1a543 (patch) | |
| tree | 4e51f3a2a64fe9650fa829b2999a5bb6be11600f | |
| parent | bebafeba4480537414e11dbe8ce08414077e5c78 (diff) | |
| parent | 23a850e5a641f8b124e700916911e22d2cdd06de (diff) | |
| download | mariadb-git-8c3efbc32aecc8c14e07fa71a884de96dfe1a543.tar.gz | |
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
sql/sql_show.cc:
Auto merged
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4faee7d248f..4fca236b165 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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)); item->maybe_null=1; field_list.push_back(item=new Item_empty_string("Comment",80)); + item->maybe_null=1; if (send_fields(thd,field_list,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); 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_data(packet,convert, thd->net.last_error); thd->net.last_error[0]=0; |