diff options
| author | unknown <jimw@mysql.com> | 2005-08-19 11:40:39 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-19 11:40:39 -0700 |
| commit | 0f556e8ff38087a7eb38af8da16c55048b4d435d (patch) | |
| tree | 81a34dbfe3c99fa5d18c6d72fcdb62989e6b9596 /sql/sql_show.cc | |
| parent | 141a36c31b9b9732a479f5b40a2ba35781418ad6 (diff) | |
| parent | 42002d5dee19ace826bdb5170c0e37ef1dfee26d (diff) | |
| download | mariadb-git-0f556e8ff38087a7eb38af8da16c55048b4d435d.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11711
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/information_schema.result:
Resolve conflicts
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3bb349d7c29..958971d65f1 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2052,7 +2052,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) { if (with_i_schema) { - table->field[3]->store("TEMPORARY", 9, system_charset_info); + table->field[3]->store("SYSTEM VIEW", 11, system_charset_info); } else { @@ -2220,7 +2220,9 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables, file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO | HA_STATUS_NO_LOCK); - if (share->tmp_table == TMP_TABLE) + if (share->tmp_table == SYSTEM_TMP_TABLE) + table->field[3]->store("SYSTEM VIEW", 11, cs); + else if (share->tmp_table) table->field[3]->store("TEMPORARY", 9, cs); else table->field[3]->store("BASE TABLE", 10, cs); @@ -3560,7 +3562,7 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list) { DBUG_RETURN(1); } - table->s->tmp_table= TMP_TABLE; + table->s->tmp_table= SYSTEM_TMP_TABLE; table->grant.privilege= SELECT_ACL; /* This test is necessary to make |