mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merged
BitKeeper/etc/ignore: auto-union myisam/myisamdef.h: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_test.cc: Auto merged sql/table.cc: Auto merged
This commit is contained in:
@ -939,7 +939,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
|
||||
protocol->store((const char*) pos, system_charset_info);
|
||||
protocol->store(table->file->index_type(i), system_charset_info);
|
||||
/* Comment */
|
||||
if (!(table->keys_in_use & ((key_map) 1 << i)))
|
||||
if (!table->keys_in_use.is_set(i))
|
||||
protocol->store("disabled",8, system_charset_info);
|
||||
else
|
||||
protocol->store("", 0, system_charset_info);
|
||||
|
Reference in New Issue
Block a user