diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-03 20:24:15 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-03 20:24:15 +0300 |
| commit | 89bb3165501b09b2922d361905a4efb7b490d8b0 (patch) | |
| tree | 97b51391b1053e0078ae3754910ee7fd30a879ee /sql/sql_show.cc | |
| parent | bd4d87297d03706b49eab04d030b2e63a4bc9997 (diff) | |
| download | mariadb-git-89bb3165501b09b2922d361905a4efb7b490d8b0.tar.gz | |
One test case, one bug fix and one new feature
mysql-test/r/innodb.result:
A test case for non-functional rollback after inserting a row into
MyISAM table with binary log enabled.
mysql-test/t/innodb.test:
A test case for non-functional rollback after inserting a row into
MyISAM table with binary log enabled.
sql/sql_show.cc:
Displaying disabled keys in SHOW KEYS
sql/sql_table.cc:
Fix for a serious bug with ALTER TABLE ENABLE / DISABLE KEYS
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 6e1cf2e8217..4d6f9d3490e 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -728,7 +728,10 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list) net_store_data(packet,convert,(const char*) pos); net_store_data(packet,convert,table->file->index_type(i)); /* Comment */ - net_store_data(packet,convert,""); + if (!(table->keys_in_use & ((key_map) 1 << i))) + net_store_data(packet,convert,"disabled",8); + else + net_store_data(packet,convert,""); if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length())) DBUG_RETURN(1); /* purecov: inspected */ } |