diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-03-11 23:32:53 +0100 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-03-11 23:32:53 +0100 |
| commit | 59fbffa45cc804bde74d504129eb705cd80b3bba (patch) | |
| tree | 07de7887085e3b95f72e3ed995042a594223f589 /sql | |
| parent | f79cb0de91a6b320966a7675dd6998c0bcf128e5 (diff) | |
| download | mariadb-git-59fbffa45cc804bde74d504129eb705cd80b3bba.tar.gz | |
Bug#40657: assertion with out of range variables and traditional sql_mode
normalize error-messages
mysql-test/r/variables.result:
show that warning uses underscore
(sysvar-name), not hyphens (option-name)
mysql-test/t/variables.test:
show that warning uses underscore
(sysvar-name), not hyphens (option-name)
sql/set_var.cc:
normalize error-messages
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d6a9cbb19ee..84e628fbddf 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1520,9 +1520,10 @@ static bool get_unsigned(THD *thd, set_var *var, ulonglong user_max, var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result. ulonglong_value, - limits, &fixed); + limits, &fixed); - if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name, + if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, + var->var->name, (longlong) unadjusted)) return TRUE; } |