diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-27 18:32:42 +0400 |
| commit | c4c678f653077f6ca93bd8b50906410e29d4b127 (patch) | |
| tree | f5b4dd56c20ccff8f87fcf2ff244d4be368ac972 /sql/sys_vars.cc | |
| parent | 740c0d3a87c07dd5f482db5705449143993e7385 (diff) | |
| parent | 8ee568cde7bef3893f5500d07ef45cb58107cff3 (diff) | |
| download | mariadb-git-c4c678f653077f6ca93bd8b50906410e29d4b127.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9e212fb95e9..320e6d9253e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -796,7 +796,11 @@ static Sys_var_lexstring Sys_init_connect( static Sys_var_charptr Sys_init_file( "init_file", "Read SQL commands from this file at startup", READ_ONLY GLOBAL_VAR(opt_init_file), - IF_DISABLE_GRANT_OPTIONS(NO_CMD_LINE, CMD_LINE(REQUIRED_ARG)), +#ifdef DISABLE_GRANT_OPTIONS + NO_CMD_LINE, +#else + CMD_LINE(REQUIRED_ARG), +#endif IN_FS_CHARSET, DEFAULT(0)); static PolyLock_rwlock PLock_sys_init_slave(&LOCK_sys_init_slave); @@ -2873,6 +2877,8 @@ static bool fix_log_output(sys_var *self, THD *thd, enum_var_type type) return false; } +static const char *log_output_names[] = { "NONE", "FILE", "TABLE", NULL}; + static Sys_var_set Sys_log_output( "log_output", "Syntax: log-output=value[,value...], " "where \"value\" could be TABLE, FILE or NONE", |