summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:16:29 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:16:29 -0300
commit60ab2b9283ffc6a7c4eeb5f94963c504d6eb8062 (patch)
tree6e64b324e47ec067c848617b8ea8340fde01d8b2 /sql/sys_vars.cc
parent72fbf95e5d92cd1c50e76707c39908bfa3de3aa0 (diff)
downloadmariadb-git-60ab2b9283ffc6a7c4eeb5f94963c504d6eb8062.tar.gz
WL#5498: Remove dead and unused source code
Remove unused macros or macro which are always defined.
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 37a87687d48..6e838759e83 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);