summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorNisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com>2013-09-05 13:40:27 +0530
committerNisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com>2013-09-05 13:40:27 +0530
commit14976fbe8a5d9e88cba6474808b8b59790e84c3e (patch)
tree778522b458bb5f9928f6bdc867d32a6bc43ae194 /sql/set_var.cc
parente203951cb1e42404ed62abbfe7eb6e4cce53218c (diff)
downloadmariadb-git-14976fbe8a5d9e88cba6474808b8b59790e84c3e.tar.gz
BUG#16032946 - PLEASE GIVE A MESSAGE FOR "THREAD_CONCURRENCY DOESN'T
DO WHAT YOU EXPECT" Fix info: -------- Backport of the deprecation bug fix (WL#5265) for global variable 'THREAD_CONCURRENCY' from mysql-5.6 to mysql-5.5 Note: With this backport, certain additional deprecation warnings would be reported under error conditions while setting the global/session variables.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 75387b974f1..82ea8298a66 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -217,7 +217,6 @@ uchar *sys_var::global_value_ptr(THD *thd, LEX_STRING *base)
bool sys_var::check(THD *thd, set_var *var)
{
- do_deprecated_warning(thd);
if ((var->value && do_check(thd, var))
|| (on_check && on_check(this, thd, var)))
{
@@ -593,6 +592,7 @@ err:
int set_var::check(THD *thd)
{
+ var->do_deprecated_warning(thd);
if (var->is_readonly())
{
my_error(ER_INCORRECT_GLOBAL_LOCAL_VAR, MYF(0), var->name.str, "read only");