diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 564a8769b6b..6f5f7640ab6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -340,7 +340,6 @@ static bool volatile select_thread_in_use, signal_thread_in_use; static volatile bool ready_to_exit; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_short_log_format= 0; -static my_bool opt_sync= 0; static uint kill_cached_threads, wake_thread; static ulong max_used_connections; static volatile ulong cached_thread_count= 0; @@ -363,7 +362,7 @@ static mysql_cond_t COND_thread_cache, COND_flush_thread_cache; bool opt_bin_log, opt_ignore_builtin_innodb= 0; my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0; ulonglong log_output_options; -my_bool opt_userstat_running, opt_thread_alarm; +my_bool opt_userstat_running; my_bool opt_log_queries_not_using_indexes= 0; bool opt_error_log= IF_WIN(1,0); bool opt_disable_networking=0, opt_skip_show_db=0; @@ -425,7 +424,6 @@ my_bool opt_secure_auth= 0; char* opt_secure_file_priv; my_bool opt_log_slow_admin_statements= 0; my_bool opt_log_slow_slave_statements= 0; -my_bool opt_query_cache_strip_comments = 0; my_bool lower_case_file_system= 0; my_bool opt_large_pages= 0; my_bool opt_super_large_pages= 0; @@ -6175,7 +6173,7 @@ struct my_option my_long_options[]= &opt_help, &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifdef HAVE_REPLICATION - {"abort-slave-event-count", 0, + {"debug-abort-slave-event-count", 0, "Option used by mysql-test for debugging and testing of replication.", &abort_slave_event_count, &abort_slave_event_count, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6261,7 +6259,7 @@ struct my_option my_long_options[]= 0, 0, 0, 0, 0, 0}, #endif /* HAVE_OPENSSL */ #ifdef HAVE_REPLICATION - {"disconnect-slave-event-count", 0, + {"debug-disconnect-slave-event-count", 0, "Option used by mysql-test for debugging and testing of replication.", &disconnect_slave_event_count, &disconnect_slave_event_count, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6270,7 +6268,7 @@ struct my_option my_long_options[]= {"stack-trace", 0 , "Print a symbolic stack trace on failure", &opt_stack_trace, &opt_stack_trace, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, #endif /* HAVE_STACKTRACE */ - {"exit-info", 'T', "Used for debugging. Use at your own risk.", 0, 0, 0, + {"debug-exit-info", 'T', "Used for debugging. Use at your own risk.", 0, 0, 0, GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"external-locking", 0, "Use system (external) locking (disabled by " "default). With this option enabled you can run myisamchk to test " @@ -6280,6 +6278,10 @@ struct my_option my_long_options[]= /* We must always support the next option to make scripts like mysqltest easier to do */ {"gdb", 0, + "Set up signals usable for debugging. Deprecated, use --debug-gdb instead.", + &opt_debugging, &opt_debugging, + 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"debug-gdb", 0, "Set up signals usable for debugging.", &opt_debugging, &opt_debugging, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -6373,7 +6375,7 @@ struct my_option my_long_options[]= {"init-rpl-role", 0, "Set the replication role.", &rpl_status, &rpl_status, &rpl_role_typelib, GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"max-binlog-dump-events", 0, + {"debug-max-binlog-dump-events", 0, "Option used by mysql-test for debugging and testing of replication.", &max_binlog_dump_events, &max_binlog_dump_events, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6476,7 +6478,7 @@ struct my_option my_long_options[]= "because it has no effect; the implied behavior is already the default.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifdef HAVE_REPLICATION - {"sporadic-binlog-dump-fail", 0, + {"debug-sporadic-binlog-dump-fail", 0, "Option used by mysql-test for debugging and testing of replication.", &opt_sporadic_binlog_dump_fail, &opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, @@ -6501,9 +6503,9 @@ struct my_option my_long_options[]= option if compiled with valgrind support. */ IF_VALGRIND(0,1), 0, 0, 0, 0, 0}, - {"sync_sys", 0, - "Enable system sync calls. Disable only when running tests or debugging!", - &opt_sync, &opt_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, + {"debug-no-sync", 0, + "Disables system sync calls. Only for running tests or debugging!", + &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"sysdate-is-now", 0, "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. " "Since 5.0, SYSDATE() returns a `dynamic' value different for different " @@ -7978,8 +7980,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) In most cases the global variables will not be used */ my_disable_locking= myisam_single_user= test(opt_external_locking == 0); - my_disable_sync= opt_sync == 0; - my_disable_thr_alarm= opt_thread_alarm == 0; my_default_record_cache_size=global_system_variables.read_buff_size; /* |