summaryrefslogtreecommitdiff
path: root/sql/mysqld.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/mysqld.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/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9c5f33f849d..05f84682697 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -229,6 +229,7 @@ static const char *sql_mode_names[] =
"NO_AUTO_VALUE_ON_ZERO", "NO_BACKSLASH_ESCAPES", "STRICT_TRANS_TABLES", "STRICT_ALL_TABLES",
"NO_ZERO_IN_DATE", "NO_ZERO_DATE", "ALLOW_INVALID_DATES", "ERROR_FOR_DIVISION_BY_ZERO",
"TRADITIONAL", "NO_AUTO_CREATE_USER", "HIGH_NOT_PRECEDENCE",
+ "NO_ENGINE_SUBSTITUTION",
NullS
};
TYPELIB sql_mode_typelib= { array_elements(sql_mode_names)-1,"",