mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
WorkLog#1280 - Remove fixed table handler from lex/yacc
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:
@ -131,6 +131,13 @@ enum db_type { DB_TYPE_UNKNOWN=0,DB_TYPE_DIAB_ISAM=1,
|
||||
DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, DB_TYPE_GEMINI,
|
||||
DB_TYPE_DEFAULT };
|
||||
|
||||
struct show_table_type_st {
|
||||
const char *type;
|
||||
SHOW_COMP_OPTION *value;
|
||||
const char *comment;
|
||||
enum db_type db_type;
|
||||
};
|
||||
|
||||
enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
|
||||
ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED};
|
||||
|
||||
@ -372,8 +379,9 @@ public:
|
||||
|
||||
/* Some extern variables used with handlers */
|
||||
|
||||
extern struct show_table_type_st sys_table_types[];
|
||||
extern const char *ha_row_type[];
|
||||
extern TYPELIB ha_table_typelib, tx_isolation_typelib;
|
||||
extern TYPELIB tx_isolation_typelib;
|
||||
|
||||
/* Wrapper functions */
|
||||
#define ha_commit_stmt(thd) (ha_commit_trans((thd), &((thd)->transaction.stmt)))
|
||||
@ -383,6 +391,8 @@ extern TYPELIB ha_table_typelib, tx_isolation_typelib;
|
||||
|
||||
#define ha_supports_generate(T) (T != DB_TYPE_INNODB)
|
||||
|
||||
enum db_type ha_resolve_by_name(const char *name, uint namelen);
|
||||
const char *ha_get_table_type(enum db_type db_type);
|
||||
handler *get_new_handler(TABLE *table, enum db_type db_type);
|
||||
my_off_t ha_get_ptr(byte *ptr, uint pack_length);
|
||||
void ha_store_ptr(byte *buff, uint pack_length, my_off_t pos);
|
||||
|
Reference in New Issue
Block a user