diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
| commit | 8300f639a14afeb379c224e10dab9d99d31cecbd (patch) | |
| tree | c67c0a5afc6062b99ec21194a99b81d3633f8c38 /sql/set_var.h | |
| parent | 804761a844906c7f7bd11139a366a5dfc1d8bcd6 (diff) | |
| parent | 50641db2d11ad8a2228f7938d851e52decb71a9b (diff) | |
| download | mariadb-git-8300f639a14afeb379c224e10dab9d99d31cecbd.tar.gz | |
Merge 10.2 into 10.3
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 7530d3eaff5..12e025e4696 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 @@ -352,6 +352,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) {} |