diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:05:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:05:08 +0300 |
| commit | 0e5f0023b3405449c8e3371cb67989f1c1fbb3f7 (patch) | |
| tree | ccdf6d71295fb66bed1a352fc14d1ca854a0d6bd /sql/mysqld.cc | |
| parent | 499ebe5459e655ede75f0d9c30608dd704e637a9 (diff) | |
| parent | 78aa48a809319ffdc0367f02908a2fcf92f19fbb (diff) | |
| download | mariadb-git-0e5f0023b3405449c8e3371cb67989f1c1fbb3f7.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
client/mysqltest.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1f70829239c..9c0d6bffe6c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3053,7 +3053,6 @@ static struct my_option my_long_options[] = */ {"memlock", OPT_MEMLOCK, "Lock mysqld in memory", (gptr*) &locked_in_memory, (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#ifndef DBUG_OFF {"disconnect-slave-event-count", OPT_DISCONNECT_SLAVE_EVENT_COUNT, "Undocumented: Meant for debugging and testing of replication", (gptr*) &disconnect_slave_event_count, @@ -3070,7 +3069,6 @@ static struct my_option my_long_options[] = (gptr*) &opt_sporadic_binlog_dump_fail, (gptr*) &opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#endif {"safemalloc-mem-limit", OPT_SAFEMALLOC_MEM_LIMIT, "Simulate memory shortage when compiled with the --with-debug=full option", 0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -4422,11 +4420,7 @@ static void get_options(int argc,char **argv) #endif if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) - { - printf("%s: handle_options() failed with error %d\n", my_progname, - ho_error); - exit(1); - } + exit(ho_error); fix_paths(); default_table_type_name=ha_table_typelib.type_names[default_table_type-1]; |