summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <antony@ltantony.rdg.cyberkinetica.homeunix.net>2003-12-17 22:52:03 +0000
committerunknown <antony@ltantony.rdg.cyberkinetica.homeunix.net>2003-12-17 22:52:03 +0000
commit69cee79246feab6844f52a1e1244704d3741bde3 (patch)
treec639b3a159120373264b2f97623f8759e2226d61 /sql/sql_show.cc
parent24794dbc6d5d0a1481b413c43e72c9bb731794c7 (diff)
downloadmariadb-git-69cee79246feab6844f52a1e1244704d3741bde3.tar.gz
WorkLog #1323 (part 2)
New Statement: SHOW [STORAGE] ENGINES New System Variable: storage_engine New mysqld Argument: --default-storage-engine= include/mysqld_error.h: We now call handlers STORAGE ENGINEs include/sql_state.h: We now call handlers STORAGE ENGINEs mysql-test/r/create.result: table_type system variable becomes storage_engine mysql-test/r/key_cache.result: table_type system variable becomes storage_engine mysql-test/r/variables.result: table_type system variable becomes storage_engine mysql-test/r/warnings.result: Test for deprecated table_type system variable mysql-test/t/create.test: table_type system variable becomes storage_engine mysql-test/t/key_cache.test: table_type system variable becomes storage_engine mysql-test/t/variables.test: table_type system variable becomes storage_engine mysql-test/t/warnings.test: Test for deprecated table_type system variable sql/handler.cc: change name for consistency sql/handler.h: change name for consistency sql/lex.h: New keywords - ENGINES and STORAGE sql/mysql_priv.h: change name for consistency sql/mysqld.cc: New command like argument for default-storage-engine sql/set_var.cc: New system variable for storage_engine sql/set_var.h: New system variable for storage_engine sql/sql_lex.h: Change for consistancy sql/sql_parse.cc: Change for consistancy sql/sql_show.cc: Change for consistancy sql/sql_table.cc: Change for consistancy sql/sql_yacc.yy: New keywords: STORAGE and ENGINES Change table_types to storage_engines New statement: SHOW [STORAGE] ENGINES
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 781ee2e7082..c3996f142ad 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -173,11 +173,11 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
** List all table types supported
***************************************************************************/
-int mysqld_show_table_types(THD *thd)
+int mysqld_show_storage_engines(THD *thd)
{
List<Item> field_list;
Protocol *protocol= thd->protocol;
- DBUG_ENTER("mysqld_show_table_types");
+ DBUG_ENTER("mysqld_show_storage_engines");
field_list.push_back(new Item_empty_string("Type",10));
field_list.push_back(new Item_empty_string("Support",10));
@@ -187,7 +187,7 @@ int mysqld_show_table_types(THD *thd)
DBUG_RETURN(1);
const char *default_type_name=
- ha_get_table_type((enum db_type)thd->variables.table_type);
+ ha_get_storage_engine((enum db_type)thd->variables.table_type);
show_table_type_st *types;
for (types= sys_table_types; types->type; types++)