diff options
author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-05-15 20:24:00 +0300 |
---|---|---|
committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-05-15 20:24:00 +0300 |
commit | 89617526c84c6d3e9fc2854ac06e8c0b1a543437 (patch) | |
tree | ee75aee2ff5951395c94fffc89097299f10f9e21 /sql | |
parent | dc2b6e456fb16685a4191537bf83e1161cb28d93 (diff) | |
download | mariadb-git-89617526c84c6d3e9fc2854ac06e8c0b1a543437.tar.gz |
Changed GET_STRALC to GET_STR_ALLOC
mysys/my_getopt.c:
Changed GET_STRALC to GET_STR_ALLOC
Added error checking for my_strdup()
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 61622556d4f..afc68a3d29e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2977,7 +2977,7 @@ static struct my_option my_long_options[] = 0, 0, 0, 0, 0, 0}, {"log-bin", OPT_BIN_LOG, "Log queries in new binary format (for replication)", - (gptr*) &opt_bin_logname, (gptr*) &opt_bin_logname, 0, GET_STRALC, + (gptr*) &opt_bin_logname, (gptr*) &opt_bin_logname, 0, GET_STR_ALLOC, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"log-bin-index", OPT_BIN_LOG_INDEX, "File that holds the names for last binary log files", @@ -3139,7 +3139,7 @@ static struct my_option my_long_options[] = REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"relay-log", OPT_RELAY_LOG, "Undocumented", (gptr*) &opt_relay_logname, (gptr*) &opt_relay_logname, 0, - GET_STRALC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"relay-log-index", OPT_RELAY_LOG_INDEX, "Undocumented", (gptr*) &opt_relaylog_index_name, (gptr*) &opt_relaylog_index_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -3208,7 +3208,7 @@ static struct my_option my_long_options[] = (gptr*) &relay_log_info_file, (gptr*) &relay_log_info_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"slave-load-tmpdir", OPT_SLAVE_LOAD_TMPDIR, "Undocumented", - (gptr*) &slave_load_tmpdir, (gptr*) &slave_load_tmpdir, 0, GET_STRALC, + (gptr*) &slave_load_tmpdir, (gptr*) &slave_load_tmpdir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"slave-skip-errors", OPT_SLAVE_SKIP_ERRORS, "Tells the slave thread to continue replication when a query returns an error from the provided list", |