diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-29 22:07:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-10-14 10:29:30 +0200 |
| commit | 173ae63114d3c36ce8366d50ac17c18765ab2ceb (patch) | |
| tree | a4a025811cf9f63af03abadd7e2e70df2531cca8 /sql/set_var.h | |
| parent | f217612fade6684c6003aea9a9bfc7ab41685ace (diff) | |
| download | mariadb-git-173ae63114d3c36ce8366d50ac17c18765ab2ceb.tar.gz | |
MDEV-12684 Show what config file a sysvar got a value from
Show the config file in I_S.SYSTEM_VARIABLES
But only if the user has FILE privilege
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 31ff0493942..e1e4d6ea0b9 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -66,7 +66,7 @@ public: READONLY=1024, ALLOCATED=2048, PARSE_EARLY=4096, NO_SET_STATEMENT=8192, AUTO_SET=16384}; enum { NO_GETOPT=-1, GETOPT_ONLY_HELP=-2 }; - enum where { CONFIG, AUTO, SQL, COMPILE_TIME, ENV }; + enum where { CONFIG, COMMAND_LINE, AUTO, SQL, COMPILE_TIME, ENV }; /** Enumeration type to indicate for a system variable whether @@ -77,6 +77,7 @@ public: my_option option; ///< min, max, default values are stored here enum where value_origin; + const char *origin_filename; protected: typedef bool (*on_check_function)(sys_var *self, THD *thd, set_var *var); |