database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

WorkLog#1280 - Remove fixed table handler from lex/yacc

Browse Source 
include/mysqld_error.h:
  New error message: unknown table engine
mysql-test/r/create.result:
  New error message: unknown table engine
mysql-test/t/create.test:
  New error message: unknown table engine
sql/lex.h:
  Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM
sql/mysql_priv.h:
  Remove unused symbol
sql/set_var.h:
  New system variable type: sys_var_thd_table_type
sql/sql_yacc.yy:
  Remove tokens and make table_types resolve at run time
sql/sql_show.cc:
  Tidy up
sql/sql_table.cc:
  Tidy up
include/sql_state.h:
  Fix indent
sql/mysqld.cc:
  optimize
mysql-test/r/rpl_change_master.result:
  It wouldn't pass the tests
mysql-test/r/variables.result:
  Fix for changes
mysql-test/r/warnings.result:
  Fix for changes
mysql-test/t/variables.test:
  Fix for changes
sql/handler.h:
  parameter is a const
sql/set_var.cc:
  Code clean up for sys_var_thd_table_type::check()
sql/handler.cc:
  More tidyup
sql/share/czech/errmsg.txt:
  Fixups during review
sql/share/danish/errmsg.txt:
  Fixups during review
sql/share/dutch/errmsg.txt:
  Fixups during review
sql/share/english/errmsg.txt:
  Fixups during review
sql/share/estonian/errmsg.txt:
  Fixups during review
sql/share/french/errmsg.txt:
  Fixups during review
sql/share/german/errmsg.txt:
  Fixups during review
sql/share/greek/errmsg.txt:
  Fixups during review
sql/share/hungarian/errmsg.txt:
  Fixups during review
sql/share/italian/errmsg.txt:
  Fixups during review
sql/share/japanese/errmsg.txt:
  Fixups during review
sql/share/korean/errmsg.txt:
  Fixups during review
sql/share/norwegian-ny/errmsg.txt:
  Fixups during review
sql/share/norwegian/errmsg.txt:
  Fixups during review
sql/share/polish/errmsg.txt:
  Fixups during review
sql/share/portuguese/errmsg.txt:
  Fixups during review
sql/share/romanian/errmsg.txt:
  Fixups during review
sql/share/russian/errmsg.txt:
  Fixups during review
sql/share/serbian/errmsg.txt:
  Fixups during review
sql/share/slovak/errmsg.txt:
  Fixups during review
sql/share/spanish/errmsg.txt:
  Fixups during review
sql/share/swedish/errmsg.txt:
  Fixups during review
sql/share/ukrainian/errmsg.txt:
  Fixups during review
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2003-12-02 20:23:13 +00:00
parent 8848cea287
commit c74c90eef6
42 changed files with 209 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/sql_show.cc
View File

@@ -173,33 +173,6 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
** List all table types supported
***************************************************************************/
struct show_table_type_st {
const char *type;
SHOW_COMP_OPTION *value;
const char *comment;
};
SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
static struct show_table_type_st sys_table_types[]=
{
{"MyISAM", &have_yes,
"Default type from 3.23 with great performance"},
{"HEAP" , &have_yes,
"Hash based, stored in memory, useful for temporary tables"},
{"MERGE", &have_yes,
"Collection of identical MyISAM tables"},
{"ISAM", &have_isam,
"Obsolete table type; Is replaced by MyISAM"},
{"InnoDB", &have_innodb,
"Supports transactions, row-level locking and foreign keys"},
{"BDB", &have_berkeley_db,
"Supports transactions and page-level locking"},
{NullS, NULL, NullS}
};
int mysqld_show_table_types(THD *thd)
{
List<Item> field_list;
@@ -213,8 +186,8 @@ int mysqld_show_table_types(THD *thd)
if (protocol->send_fields(&field_list,1))
DBUG_RETURN(1);
const char *default_type_name=
ha_table_typelib.type_names[thd->variables.table_type];
const char *default_type_name=
ha_get_table_type((enum db_type)thd->variables.table_type);
show_table_type_st *types;
for (types= sys_table_types; types->type; types++)