diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
| commit | 02979daab48d871e8c43a227b8f4462128439f17 (patch) | |
| tree | 21dba14f0073df2328677ed0a90a3596f043bdeb /sql/set_var.cc | |
| parent | efbfcc8b73d9fd8bafd86ab387e0c1edd39e208b (diff) | |
| parent | 192aa295b4bc877d0fed24154c57304c3f789179 (diff) | |
| download | mariadb-git-02979daab48d871e8c43a227b8f4462128439f17.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 4b0257871ac..812f25949eb 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -808,7 +808,7 @@ int set_var::light_check(THD *thd) if (var->check_type(type)) { int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE; - my_error(err, MYF(0), var->name); + my_error(err, MYF(0), var->name.str); return -1; } if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)) |