diff options
| author | Martin Hansson <martin.hansson@oracle.com> | 2012-08-24 10:17:08 +0200 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@oracle.com> | 2012-08-24 10:17:08 +0200 |
| commit | df2bdd6063e1a9a05be0048a309288dc4d7a8ce4 (patch) | |
| tree | f1359d24de152fb5cf9bff589dee79d0124ab9f3 /sql/sql_plugin.cc | |
| parent | 17695cb4ffcddb9634a9e27c459eab943ceae36e (diff) | |
| download | mariadb-git-df2bdd6063e1a9a05be0048a309288dc4d7a8ce4.tar.gz | |
Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION
NUMBERS
If a system variable was declared as deprecated without mention of an
alternative, the message would look funny, e.g. for @@delayed_insert_limit:
Warning 1287 '@@delayed_insert_limit' is deprecated and
will be removed in MySQL .
The message was meant to display the version number, but it's not
possible to give one when declaring a system variable.
The fix does two things:
1) The definition of the message
ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT is changed so that it does
not display a version number. I.e. in English the message now reads:
Warning 1287 The syntax '@@delayed_insert_limit' is deprecated and
will be removed in a future version.
2) The message ER_WARN_DEPRECATED_SYNTAX_WITH_VER is discontinued in
favor of ER_WARN_DEPRECATED_SYNTAX for system variables. This change
was already done in versions 5.6 and above as part of wl#5265. This
part is simply back-ported from the worklog.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 47827e0e567..1dbc76537da 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -223,7 +223,7 @@ public: (plugin_var_arg->flags & PLUGIN_VAR_THDLOCAL ? SESSION : GLOBAL) | (plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0), 0, -1, NO_ARG, pluginvar_show_type(plugin_var_arg), 0, 0, - VARIABLE_NOT_IN_BINLOG, 0, 0, 0, 0, PARSE_NORMAL), + VARIABLE_NOT_IN_BINLOG, NULL, NULL, NULL, PARSE_NORMAL), plugin_var(plugin_var_arg), orig_pluginvar_name(plugin_var_arg->name) { plugin_var->name= name_arg; } sys_var_pluginvar *cast_pluginvar() { return this; } |