diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
| commit | 7cb2e2d1dce2c7466388f4a6ade0614564be82fc (patch) | |
| tree | 8de3d7e1875b8751450433ee53331ffb7322e7b5 /sql/sql_show.cc | |
| parent | 0e5f0023b3405449c8e3371cb67989f1c1fbb3f7 (diff) | |
| parent | 32113efe2a7d32bfa5820cda37164436a53719cc (diff) | |
| download | mariadb-git-7cb2e2d1dce2c7466388f4a6ade0614564be82fc.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 9fb1e88aeea..e0ce0f0f793 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -432,6 +432,7 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, TABLE *table; handler *file; char tmp[MAX_FIELD_WIDTH]; + Item *item; CONVERT *convert=thd->convert_set; DBUG_ENTER("mysqld_show_fields"); DBUG_PRINT("enter",("db: %s table: %s",table_list->db, @@ -451,7 +452,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, field_list.push_back(new Item_empty_string("Type",40)); field_list.push_back(new Item_empty_string("Null",1)); field_list.push_back(new Item_empty_string("Key",3)); - field_list.push_back(new Item_empty_string("Default",NAME_LEN)); + field_list.push_back(item=new Item_empty_string("Default",NAME_LEN)); + item->maybe_null=1; field_list.push_back(new Item_empty_string("Extra",20)); if (verbose) field_list.push_back(new Item_empty_string("Privileges",80)); |