diff options
| author | unknown <acurtis@xiphis.org> | 2005-06-17 22:14:44 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-06-17 22:14:44 +0100 |
| commit | c25470e3a1f66e46184dd093c81e16694ca95ae9 (patch) | |
| tree | 2ba5a923fd8c126d9ccb26dc09b9d5d14f52b50f /sql/handler.h | |
| parent | 79180b1994bee1cc432f2fe968f422613857b2eb (diff) | |
| download | mariadb-git-c25470e3a1f66e46184dd093c81e16694ca95ae9.tar.gz | |
Bug#6877 MySQL should give an error if the requested table type is not available
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
mysql-test/r/sql_mode.result:
Test for bug 6877
mysql-test/t/sql_mode.test:
Test for bug 6877
sql/handler.cc:
change to ha_checktype()
sql/handler.h:
change to ha_checktype()
sql/mysql_priv.h:
new sql mode NO_ENGINE_SUBSTITUTION
change to args for get_table_type() and create_frm()
sql/mysqld.cc:
new sql mode NO_ENGINE_SUBSTITUTION
sql/set_var.cc:
change to ha_checktype() args
sql/sql_delete.cc:
change to get_table_type() args
sql/sql_rename.cc:
change to get_table_type() args
sql/sql_table.cc:
move common code to check_engine()
change to ha_checktype(), get_table_type() args
sql/table.cc:
change to ha_checktype(), create_frm(), get_table_type() args
sql/unireg.cc:
change to create_frm() args
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 3b0b9afe320..06ea28dbc94 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -813,7 +813,8 @@ extern ulong total_ha, total_ha_2pc; enum db_type ha_resolve_by_name(const char *name, uint namelen); const char *ha_get_storage_engine(enum db_type db_type); handler *get_new_handler(TABLE *table, enum db_type db_type); -enum db_type ha_checktype(enum db_type database_type); +enum db_type ha_checktype(THD *thd, enum db_type database_type, + bool no_substitute, bool report_error); /* basic stuff */ int ha_init(void); |