summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2005-06-17 22:14:44 +0100
committerunknown <acurtis@xiphis.org>2005-06-17 22:14:44 +0100
commitc25470e3a1f66e46184dd093c81e16694ca95ae9 (patch)
tree2ba5a923fd8c126d9ccb26dc09b9d5d14f52b50f /sql/sql_delete.cc
parent79180b1994bee1cc432f2fe968f422613857b2eb (diff)
downloadmariadb-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/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index d782744162d..25fef8b0ad6 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -790,7 +790,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
if (!dont_send_ok)
{
db_type table_type;
- if ((table_type=get_table_type(path)) == DB_TYPE_UNKNOWN)
+ if ((table_type=get_table_type(thd, path)) == DB_TYPE_UNKNOWN)
{
my_error(ER_NO_SUCH_TABLE, MYF(0),
table_list->db, table_list->table_name);