database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge zim.(none):/home/brian/mysql/mysql-5.0

Browse Source 
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
This commit is contained in:
brian@zim.(none)
2005-08-30 14:40:02 -07:00
parent b423cbf2ce 2b0c81c984
commit 57403ddc9d
143 changed files with 6348 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@ -2248,7 +2248,7 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
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);
table->field[3]->store("LOCAL TEMPORARY", 15, cs);
else
table->field[3]->store("BASE TABLE", 10, cs);