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
This commit is contained in:
Tatiana A. Nurnberg 2009-03-11 23:32:53 +01:00
commit 59fbffa45c
3 changed files with 14 additions and 2 deletions

View file

@ -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;
}