summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-03-12 22:01:29 +0100
committerunknown <guilhem@mysql.com>2004-03-12 22:01:29 +0100
commite05fc023db16e8b6a955311c0e09b08c53223796 (patch)
tree7f0452a0d8ef16adcfdc17604c49f0a7c5b1bd8c
parent865685d5e7c2aa7718144fe200f122a10220765b (diff)
downloadmariadb-git-e05fc023db16e8b6a955311c0e09b08c53223796.tar.gz
Force mysqlbinlog to require an argument if --local-load is used
(--local-load alone means "I want files to be prepared for LOAD DATA INFILE, in the default temp directory", and mysqlbinlog already does this without --local-load). client/mysqlbinlog.cc: --local-load always needs an argument; --local-load alone is of no use.
-rw-r--r--client/mysqlbinlog.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 72f68f9fe86..58adbdf9042 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -438,9 +438,9 @@ static struct my_option my_long_options[] =
{"user", 'u', "Connect to the remote server as username.",
(gptr*) &user, (gptr*) &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0,
0, 0},
- {"local-load", 'l', "Prepare files for local load in directory.",
+ {"local-load", 'l', "Prepare local temporary files for LOAD DATA INFILE in the specified directory.",
(gptr*) &dirname_for_local_load, (gptr*) &dirname_for_local_load, 0,
- GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0},
+ GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Print version and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
@@ -947,7 +947,7 @@ int main(int argc, char** argv)
exit(1);
if (dirname_for_local_load)
load_processor.init_by_dir_name(dirname_for_local_load);
- else
+ else /* my_malloc() failed in my_strdup() */
load_processor.init_by_cur_dir();
exit_value= 0;