diff options
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 05b17a476ec..b13a7de6339 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2083,7 +2083,7 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet, uint primary_key; KEY *key_info; TABLE *table= table_list->table; - re_setup_table(table); + table->setup_table_hash(); TABLE_SHARE *share= table->s; sql_mode_t sql_mode= thd->variables.sql_mode; bool explicit_fields= false; @@ -2442,7 +2442,7 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet, } #endif tmp_restore_column_map(table->read_set, old_map); - setup_table_hash(table); + table->re_setup_table(); DBUG_RETURN(error); } @@ -6556,7 +6556,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables, HA_STATUS_TIME); set_statistics_for_table(thd, show_table); } - re_setup_table(show_table); + show_table->setup_table_hash(); for (uint i=0 ; i < show_table->s->keys ; i++,key_info++) { if ((key_info->flags & HA_INVISIBLE_KEY) && @@ -6630,7 +6630,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables, DBUG_RETURN(1); } } - setup_table_hash(show_table); + show_table->re_setup_table(); } DBUG_RETURN(res); } @@ -6859,7 +6859,7 @@ static int get_schema_constraints_record(THD *thd, TABLE_LIST *tables, show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); - re_setup_table(show_table); + show_table->setup_table_hash(); for (uint i=0 ; i < show_table->s->keys ; i++, key_info++) { if (i != primary_key && !(key_info->flags & HA_NOSAME)) @@ -6880,7 +6880,7 @@ static int get_schema_constraints_record(THD *thd, TABLE_LIST *tables, DBUG_RETURN(1); } } - setup_table_hash(show_table); + show_table->re_setup_table(); // Table check constraints for ( uint i = 0; i < show_table->s->table_check_constraints; i++ ) @@ -7059,7 +7059,7 @@ static int get_schema_key_column_usage_record(THD *thd, show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); - re_setup_table(show_table); + show_table->setup_table_hash(); for (uint i=0 ; i < show_table->s->keys ; i++, key_info++) { if (i != primary_key && !(key_info->flags & HA_NOSAME)) @@ -7082,7 +7082,7 @@ static int get_schema_key_column_usage_record(THD *thd, } } } - setup_table_hash(show_table); + show_table->re_setup_table(); show_table->file->get_foreign_key_list(thd, &f_key_list); FOREIGN_KEY_INFO *f_key_info; |