diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
| commit | 58a75bb18b2a4080c8fae77024afed37f1be1314 (patch) | |
| tree | 4d9d65f5747636d6dea9295e79464108df24a9a2 /extra | |
| parent | 99b79db5dca6909456a40d859298ba3992b145da (diff) | |
| parent | a82671178919afba86ddfdf2b64321eb9afff8e5 (diff) | |
| download | mariadb-git-58a75bb18b2a4080c8fae77024afed37f1be1314.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/my_print_defaults.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index da7061471fa..847738951dd 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -55,8 +55,8 @@ static struct my_option my_long_options[] = {"debug", '#', "This is a non-debug version. Catch this and exit", 0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0}, #else - {"debug", '#', "Output debug log", &default_dbug_option, - &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, + {"debug", '#', "Output debug log", (char**) &default_dbug_option, + (char**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, #endif {"defaults-file", 'c', "Like --config-file, except: if first option, " "then read this file only, do not read global or per-user config " |