diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 09:45:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 09:45:39 +0300 |
| commit | 701efbb25b738f0c971798c5234d4d66b9235e47 (patch) | |
| tree | 0835d2d3e58ffa8566cf6b1e8211d6484bccc57c /sql/set_var.h | |
| parent | d5e8b4d7f97c7a15be5d58b6f088c4c64787a385 (diff) | |
| parent | 80591481549213f5701642e682cc2974b60c53dd (diff) | |
| download | mariadb-git-701efbb25b738f0c971798c5234d4d66b9235e47.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 41a0010acf2..18c4dbc664e 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -1,7 +1,7 @@ #ifndef SET_VAR_INCLUDED #define SET_VAR_INCLUDED /* Copyright (c) 2002, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, SkySQL Ab. + Copyright (c) 2009, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -370,6 +370,7 @@ class set_var_default_role: public set_var_base { LEX_USER *user, *real_user; LEX_CSTRING role; + const char *real_role; public: set_var_default_role(LEX_USER *user_arg, LEX_CSTRING role_arg) : user(user_arg), role(role_arg) {} |