diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-08 16:59:23 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-01-08 16:59:23 +0200 |
| commit | 28df6d6e00d60742f6578871a04c1b5488a0cd3b (patch) | |
| tree | 13769f692c938658079eb1faa7c6c97cb3119537 /sql | |
| parent | 844d6ed4b26e676418eb3867682fc1a2949e4706 (diff) | |
| parent | 2815ffeeb9a62c04359c49e21a8b5653bde996f1 (diff) | |
| download | mariadb-git-28df6d6e00d60742f6578871a04c1b5488a0cd3b.tar.gz | |
Merge mysql-5.1-innodb -> mysql-5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index eb376da74d1..cf6a34d4ef5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4647,9 +4647,10 @@ static int get_schema_constraints_record(THD *thd, TABLE_LIST *tables, TABLE *show_table= tables->table; KEY *key_info=show_table->key_info; uint primary_key= show_table->s->primary_key; - show_table->file->info(HA_STATUS_VARIABLE | - HA_STATUS_NO_LOCK | - HA_STATUS_TIME); + + // This is not needed since no statistics are displayed. + // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); + for (uint i=0 ; i < show_table->s->keys ; i++, key_info++) { if (i != primary_key && !(key_info->flags & HA_NOSAME)) @@ -4831,9 +4832,10 @@ static int get_schema_key_column_usage_record(THD *thd, TABLE *show_table= tables->table; KEY *key_info=show_table->key_info; uint primary_key= show_table->s->primary_key; - show_table->file->info(HA_STATUS_VARIABLE | - HA_STATUS_NO_LOCK | - HA_STATUS_TIME); + + // This is not needed since no statistics are displayed. + // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); + for (uint i=0 ; i < show_table->s->keys ; i++, key_info++) { if (i != primary_key && !(key_info->flags & HA_NOSAME)) @@ -5562,9 +5564,9 @@ get_referential_constraints_record(THD *thd, TABLE_LIST *tables, { List<FOREIGN_KEY_INFO> f_key_list; TABLE *show_table= tables->table; - show_table->file->info(HA_STATUS_VARIABLE | - HA_STATUS_NO_LOCK | - HA_STATUS_TIME); + + // This is not needed since no statistics are displayed. + // show_table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK | HA_STATUS_TIME); show_table->file->get_foreign_key_list(thd, &f_key_list); FOREIGN_KEY_INFO *f_key_info; |