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

standard values for table type in SHOW TABLES (BUG#4603)

Browse Source 
mysql-test/r/connect.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ctype_recoding.result:
  standard values for table type in SHOW TABLES
mysql-test/r/drop.result:
  standard values for table type in SHOW TABLES
mysql-test/r/greedy_optimizer.result:
  fixed results
mysql-test/r/lowercase_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/ps_1general.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rename.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl000009.result:
  standard values for table type in SHOW TABLES
mysql-test/r/rpl_error_ignored_table.result:
  standard values for table type in SHOW TABLES
mysql-test/r/select.result:
  standard values for table type in SHOW TABLES
mysql-test/r/system_mysql_db.result:
  standard values for table type in SHOW TABLES
mysql-test/r/view.result:
  standard values for table type in SHOW TABLES
sql/sql_show.cc:
  standard values for table type in SHOW TABLES
  debugging trap
This commit is contained in:
unknown
2004-07-19 12:07:33 +03:00
parent 9fc19ce8f5
commit 10d0dca6b4
13 changed files with 168 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_show.cc
View File

@ -159,7 +159,7 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
len= FN_LEN - len;
field_list.push_back(field);
if (show_type)
field_list.push_back(new Item_empty_string("Type", 5));
field_list.push_back(new Item_empty_string("table_type", 10));
if (protocol->send_fields(&field_list,1))
DBUG_RETURN(1);
if (mysql_find_files(thd,&files,db,path,wild,0))
@ -175,14 +175,16 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
switch (mysql_frm_type(path))
{
case FRMTYPE_ERROR:
protocol->store("error", system_charset_info);
protocol->store("ERROR", system_charset_info);
break;
case FRMTYPE_TABLE:
protocol->store("table", system_charset_info);
protocol->store("BASE TABLE", system_charset_info);
break;
case FRMTYPE_VIEW:
protocol->store("view", system_charset_info);
protocol->store("VIEW", system_charset_info);
break;
default:
DBUG_ASSERT(0); // this should be impossible
}
}
if (protocol->write())