diff options
| author | monty@mysql.com <> | 2003-12-30 13:16:49 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-30 13:16:49 +0200 |
| commit | 2ea2d1574978552b832a4edee36c37be216e7c9e (patch) | |
| tree | 68178a5180429525e68155fcadd4072e95759e17 /sql/set_var.cc | |
| parent | c1dd070ba73952d0c18c8ca01a9cbf322fcab26e (diff) | |
| parent | ac3ddc8d6c715362728adb197e7f332f67f3bfc9 (diff) | |
| download | mariadb-git-2ea2d1574978552b832a4edee36c37be216e7c9e.tar.gz | |
Merge
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 70e56825467..693d8e4c958 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1032,9 +1032,8 @@ Item *sys_var::item(THD *thd, enum_var_type var_type) { if (var_type != OPT_DEFAULT) { - net_printf(&thd->net, - var_type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : - ER_GLOBAL_VARIABLE, name); + net_printf(&thd->net,ER_INCORRECT_GLOBAL_LOCAL_VAR, + name, var_type == OPT_GLOBAL ? "LOCAL" : "GLOBAL"); return 0; } /* As there was no local variable, return the global value */ |