diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
| commit | 3f0a54e35e2c94da81c191d3fe5c0b6089fd26de (patch) | |
| tree | 172c0cf755a99a530b5a757eba82daabb01ba056 /sql/set_var.cc | |
| parent | 6551e173f9912225fca3aaada563d95aaac987f8 (diff) | |
| parent | b105e8f5bc0397fa35f7f79c42764bdb27f53b90 (diff) | |
| download | mariadb-git-3f0a54e35e2c94da81c191d3fe5c0b6089fd26de.tar.gz | |
Merge
Diffstat (limited to 'sql/set_var.cc')
| -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 3464661dff9..7d20c0f46a7 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1522,9 +1522,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; } |