summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2006-03-01 21:36:05 +0100
committerunknown <serg@serg.mylan>2006-03-01 21:36:05 +0100
commita28368f2c2ce46258a8ead05af2e4d1b5cce7a38 (patch)
tree45b7fa34e4dd30896530057e23903f45ab164a78 /sql/set_var.cc
parenta636ec4dec6a5f2dee1ce7227b6e1146aa2c72e7 (diff)
downloadmariadb-git-a28368f2c2ce46258a8ead05af2e4d1b5cce7a38.tar.gz
for every deprecated feature say when it will be removed.
restore CREATE TABLE ... TYPE=engine until 5.2
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 7ff3401b102..bf3fdd8c8d7 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2775,7 +2775,7 @@ static bool set_log_update(THD *thd, set_var *var)
See sql/mysqld.cc/, comments in function init_server_components() for an
explaination of the different warnings we send below
*/
-
+
if (opt_sql_bin_update)
{
((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |
@@ -3256,10 +3256,7 @@ bool sys_var_thd_storage_engine::update(THD *thd, set_var *var)
void sys_var_thd_table_type::warn_deprecated(THD *thd)
{
- push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
- ER_WARN_DEPRECATED_SYNTAX,
- ER(ER_WARN_DEPRECATED_SYNTAX), "table_type",
- "storage_engine");
+ WARN_DEPRECATED(thd, "5.2", "table_type", "'storage_engine'");
}
void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
@@ -3516,10 +3513,8 @@ bool process_key_caches(int (* func) (const char *name, KEY_CACHE *))
void sys_var_trust_routine_creators::warn_deprecated(THD *thd)
{
- push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
- ER_WARN_DEPRECATED_SYNTAX,
- ER(ER_WARN_DEPRECATED_SYNTAX), "log_bin_trust_routine_creators",
- "log_bin_trust_function_creators");
+ WARN_DEPRECATED(thd, "5.2", "log_bin_trust_routine_creators",
+ "'log_bin_trust_function_creators'");
}
void sys_var_trust_routine_creators::set_default(THD *thd, enum_var_type type)