Commit c0b511ea authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


sql/mysqld.cc:
  Auto merged
parents 97dbe8db fefb444c

sql/mysqld.cc

+26 −26
Original line number Diff line number Diff line
@@ -4494,6 +4494,7 @@ struct show_var_st status_vars[]= { 
  {"Com_show_databases",       (char*) (com_stat+(uint) SQLCOM_SHOW_DATABASES),SHOW_LONG},

  {"Com_show_fields",	       (char*) (com_stat+(uint) SQLCOM_SHOW_FIELDS),SHOW_LONG},

  {"Com_show_grants",	       (char*) (com_stat+(uint) SQLCOM_SHOW_GRANTS),SHOW_LONG},

  {"Com_show_innodb_status",   (char*) (com_stat+(uint) SQLCOM_SHOW_INNODB_STATUS),SHOW_LONG},

  {"Com_show_keys",	       (char*) (com_stat+(uint) SQLCOM_SHOW_KEYS),SHOW_LONG},

  {"Com_show_logs",	       (char*) (com_stat+(uint) SQLCOM_SHOW_LOGS),SHOW_LONG},

  {"Com_show_master_status",   (char*) (com_stat+(uint) SQLCOM_SHOW_MASTER_STAT),SHOW_LONG},
@@ -4503,7 +4504,6 @@ struct show_var_st status_vars[]= { 
  {"Com_show_slave_hosts",     (char*) (com_stat+(uint) SQLCOM_SHOW_SLAVE_HOSTS),SHOW_LONG},

  {"Com_show_slave_status",    (char*) (com_stat+(uint) SQLCOM_SHOW_SLAVE_STAT),SHOW_LONG},

  {"Com_show_status",	       (char*) (com_stat+(uint) SQLCOM_SHOW_STATUS),SHOW_LONG},

  {"Com_show_innodb_status",   (char*) (com_stat+(uint) SQLCOM_SHOW_INNODB_STATUS),SHOW_LONG},

  {"Com_show_tables",	       (char*) (com_stat+(uint) SQLCOM_SHOW_TABLES),SHOW_LONG},

  {"Com_show_variables",       (char*) (com_stat+(uint) SQLCOM_SHOW_VARIABLES),SHOW_LONG},

  {"Com_slave_start",	       (char*) (com_stat+(uint) SQLCOM_SLAVE_START),SHOW_LONG},
@@ -4514,11 +4514,11 @@ struct show_var_st status_vars[]= { 
  {"Com_update_multi",	       (char*) (com_stat+(uint) SQLCOM_MULTI_UPDATE),SHOW_LONG},

  {"Connections",              (char*) &thread_id,              SHOW_LONG_CONST},

  {"Created_tmp_disk_tables",  (char*) &created_tmp_disk_tables,SHOW_LONG},

  {"Created_tmp_tables",       (char*) &created_tmp_tables,     SHOW_LONG},

  {"Created_tmp_files",	       (char*) &my_tmp_file_created,	SHOW_LONG},

  {"Created_tmp_tables",       (char*) &created_tmp_tables,     SHOW_LONG},

  {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},

  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_CONST},

  {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},

  {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},

  {"Flush_commands",           (char*) &refresh_version,        SHOW_LONG_CONST},

  {"Handler_commit",           (char*) &ha_commit_count,        SHOW_LONG},

  {"Handler_delete",           (char*) &ha_delete_count,        SHOW_LONG},
@@ -4537,26 +4537,26 @@ struct show_var_st status_vars[]= { 
  {"Key_write_requests",       (char*) &_my_cache_w_requests,   SHOW_LONG},

  {"Key_writes",               (char*) &_my_cache_write,        SHOW_LONG},

  {"Max_used_connections",     (char*) &max_used_connections,   SHOW_LONG},

  {"Not_flushed_key_blocks",   (char*) &_my_blocks_changed,     SHOW_LONG_CONST},

  {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use,    SHOW_LONG_CONST},

  {"Open_tables",              (char*) 0,                       SHOW_OPENTABLES},

  {"Not_flushed_key_blocks",   (char*) &_my_blocks_changed,     SHOW_LONG_CONST},

  {"Open_files",               (char*) &my_file_opened,         SHOW_LONG_CONST},

  {"Open_streams",             (char*) &my_stream_opened,       SHOW_LONG_CONST},

  {"Open_tables",              (char*) 0,                       SHOW_OPENTABLES},

  {"Opened_tables",            (char*) &opened_tables,          SHOW_LONG},

  {"Questions",                (char*) 0,                       SHOW_QUESTION},

#ifdef HAVE_QUERY_CACHE

  {"Qcache_queries_in_cache",  (char*) &query_cache.queries_in_cache, SHOW_LONG_CONST},

  {"Qcache_inserts",           (char*) &query_cache.inserts,    SHOW_LONG},

  {"Qcache_free_blocks",       (char*) &query_cache.free_memory_blocks,

   SHOW_LONG_CONST},

  {"Qcache_free_memory",       (char*) &query_cache.free_memory, 

   SHOW_LONG_CONST},

  {"Qcache_hits",              (char*) &query_cache.hits,       SHOW_LONG},

  {"Qcache_inserts",           (char*) &query_cache.inserts,    SHOW_LONG},

  {"Qcache_lowmem_prunes",     (char*) &query_cache.lowmem_prunes, SHOW_LONG},

  {"Qcache_not_cached",        (char*) &query_cache.refused,    SHOW_LONG},

  {"Qcache_free_memory",       (char*) &query_cache.free_memory, 

   SHOW_LONG_CONST},

  {"Qcache_free_blocks",       (char*) &query_cache.free_memory_blocks,

   SHOW_LONG_CONST},

  {"Qcache_queries_in_cache",  (char*) &query_cache.queries_in_cache, SHOW_LONG_CONST},

  {"Qcache_total_blocks",      (char*) &query_cache.total_blocks,

   SHOW_LONG_CONST},

#endif /*HAVE_QUERY_CACHE*/

  {"Questions",                (char*) 0,                       SHOW_QUESTION},

  {"Rpl_status",               (char*) 0,                 SHOW_RPL_STATUS},

  {"Select_full_join",         (char*) &select_full_join_count, SHOW_LONG},

  {"Select_full_range_join",   (char*) &select_full_range_join_count, SHOW_LONG},
@@ -4572,35 +4572,35 @@ struct show_var_st status_vars[]= { 
  {"Sort_rows",		       (char*) &filesort_rows,	        SHOW_LONG},

  {"Sort_scan",		       (char*) &filesort_scan_count,    SHOW_LONG},

#ifdef HAVE_OPENSSL

  {"Ssl_accept_renegotiates",  (char*) 0, 	SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE},

  {"Ssl_accepts",              (char*) 0,  	SHOW_SSL_CTX_SESS_ACCEPT},

  {"Ssl_callback_cache_hits",  (char*) 0,	SHOW_SSL_CTX_SESS_CB_HITS},

  {"Ssl_cipher",               (char*) 0,  	SHOW_SSL_GET_CIPHER},

  {"Ssl_cipher_list",          (char*) 0,  	SHOW_SSL_GET_CIPHER_LIST},

  {"Ssl_client_connects",      (char*) 0,	SHOW_SSL_CTX_SESS_CONNECT},

  {"Ssl_connect_renegotiates", (char*) 0, 	SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE},

  {"Ssl_ctx_verify_depth",     (char*) 0,	SHOW_SSL_CTX_GET_VERIFY_DEPTH},

  {"Ssl_ctx_verify_mode",      (char*) 0,	SHOW_SSL_CTX_GET_VERIFY_MODE},

  {"Ssl_default_timeout",      (char*) 0,  	SHOW_SSL_GET_DEFAULT_TIMEOUT},

  {"Ssl_finished_accepts",     (char*) 0,  	SHOW_SSL_CTX_SESS_ACCEPT_GOOD},

  {"Ssl_finished_connects",    (char*) 0,  	SHOW_SSL_CTX_SESS_CONNECT_GOOD},

  {"Ssl_accept_renegotiates",  (char*) 0, 	SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE},

  {"Ssl_connect_renegotiates", (char*) 0, 	SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE},

  {"Ssl_callback_cache_hits",  (char*) 0,	SHOW_SSL_CTX_SESS_CB_HITS},

  {"Ssl_session_cache_hits",   (char*) 0,	SHOW_SSL_CTX_SESS_HITS},

  {"Ssl_session_cache_misses", (char*) 0,	SHOW_SSL_CTX_SESS_MISSES},

  {"Ssl_session_cache_timeouts", (char*) 0,	SHOW_SSL_CTX_SESS_TIMEOUTS},

  {"Ssl_used_session_cache_entries",(char*) 0,	SHOW_SSL_CTX_SESS_NUMBER},

  {"Ssl_client_connects",      (char*) 0,	SHOW_SSL_CTX_SESS_CONNECT},

  {"Ssl_session_cache_mode",   (char*) 0,	SHOW_SSL_CTX_GET_SESSION_CACHE_MODE},

  {"Ssl_session_cache_overflows", (char*) 0,	SHOW_SSL_CTX_SESS_CACHE_FULL},

  {"Ssl_session_cache_size",   (char*) 0,	SHOW_SSL_CTX_SESS_GET_CACHE_SIZE},

  {"Ssl_session_cache_mode",   (char*) 0,	SHOW_SSL_CTX_GET_SESSION_CACHE_MODE},

  {"Ssl_session_cache_timeouts", (char*) 0,	SHOW_SSL_CTX_SESS_TIMEOUTS},

  {"Ssl_sessions_reused",      (char*) 0,	SHOW_SSL_SESSION_REUSED},

  {"Ssl_ctx_verify_mode",      (char*) 0,	SHOW_SSL_CTX_GET_VERIFY_MODE},

  {"Ssl_ctx_verify_depth",     (char*) 0,	SHOW_SSL_CTX_GET_VERIFY_DEPTH},

  {"Ssl_verify_mode",          (char*) 0,	SHOW_SSL_GET_VERIFY_MODE},

  {"Ssl_used_session_cache_entries",(char*) 0,	SHOW_SSL_CTX_SESS_NUMBER},

  {"Ssl_verify_depth",         (char*) 0,	SHOW_SSL_GET_VERIFY_DEPTH},

  {"Ssl_verify_mode",          (char*) 0,	SHOW_SSL_GET_VERIFY_MODE},

  {"Ssl_version",   	       (char*) 0,  	SHOW_SSL_GET_VERSION},

  {"Ssl_cipher",               (char*) 0,  	SHOW_SSL_GET_CIPHER},

  {"Ssl_cipher_list",          (char*) 0,  	SHOW_SSL_GET_CIPHER_LIST},

  {"Ssl_default_timeout",      (char*) 0,  	SHOW_SSL_GET_DEFAULT_TIMEOUT},

#endif /* HAVE_OPENSSL */

  {"Table_locks_immediate",    (char*) &locks_immediate,        SHOW_LONG},

  {"Table_locks_waited",       (char*) &locks_waited,           SHOW_LONG},

  {"Threads_cached",           (char*) &cached_thread_count,    SHOW_LONG_CONST},

  {"Threads_created",	       (char*) &thread_created,		SHOW_LONG_CONST},

  {"Threads_connected",        (char*) &thread_count,           SHOW_INT_CONST},

  {"Threads_created",	       (char*) &thread_created,		SHOW_LONG_CONST},

  {"Threads_running",          (char*) &thread_running,         SHOW_INT_CONST},

  {"Uptime",                   (char*) 0,                       SHOW_STARTTIME},

  {NullS, NullS, SHOW_LONG}

sql/set_var.cc

+15 −15
Original line number Diff line number Diff line
@@ -496,18 +496,18 @@ struct show_var_st init_vars[]= { 
  {sys_flush.name,             (char*) &sys_flush,                  SHOW_SYS},

  {sys_flush_time.name,        (char*) &sys_flush_time,             SHOW_SYS},

  {"ft_boolean_syntax",       (char*) ft_boolean_syntax,	    SHOW_CHAR},

  {"ft_min_word_len",         (char*) &ft_min_word_len,             SHOW_LONG},

  {"ft_max_word_len",         (char*) &ft_max_word_len,             SHOW_LONG},

  {"ft_max_word_len_for_sort",(char*) &ft_max_word_len_for_sort,    SHOW_LONG},

  {"ft_min_word_len",         (char*) &ft_min_word_len,             SHOW_LONG},

  {"ft_stopword_file",        (char*) &ft_stopword_file,            SHOW_CHAR_PTR},

  {"have_bdb",		      (char*) &have_berkeley_db,	    SHOW_HAVE},

  {"have_crypt",	      (char*) &have_crypt,		    SHOW_HAVE},

  {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},

  {"have_isam",	      	      (char*) &have_isam,		    SHOW_HAVE},

  {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},

  {"have_symlink",            (char*) &have_symlink,         	    SHOW_HAVE},

  {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},

  {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},

  {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},

  {"have_symlink",            (char*) &have_symlink,         	    SHOW_HAVE},

  {"init_file",               (char*) &opt_init_file,               SHOW_CHAR_PTR},

#ifdef HAVE_INNOBASE_DB

  {"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG },
@@ -515,12 +515,11 @@ struct show_var_st init_vars[]= { 
  {"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONG },

  {"innodb_data_file_path", (char*) &innobase_data_file_path,	    SHOW_CHAR_PTR},

  {"innodb_data_home_dir",  (char*) &innobase_data_home_dir,	    SHOW_CHAR_PTR},

  {"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL},

  {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },

  {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },

  {"innodb_thread_concurrency", (char*) &innobase_thread_concurrency, SHOW_LONG },

  {"innodb_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_INT},

  {"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL},

  {"innodb_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},

  {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },

  {"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG },

  {"innodb_log_arch_dir",   (char*) &innobase_log_arch_dir, 	    SHOW_CHAR_PTR},

  {"innodb_log_archive",    (char*) &innobase_log_archive, 	    SHOW_MY_BOOL},
@@ -528,10 +527,11 @@ struct show_var_st init_vars[]= { 
  {"innodb_log_file_size", (char*) &innobase_log_file_size, SHOW_LONG},

  {"innodb_log_files_in_group", (char*) &innobase_log_files_in_group,	SHOW_LONG},

  {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},

  {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},

  {sys_innodb_max_dirty_pages_pct.name, (char*) &sys_innodb_max_dirty_pages_pct, SHOW_SYS},

  {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS},

  {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},

  {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},

  {"innodb_thread_concurrency", (char*) &innobase_thread_concurrency, SHOW_LONG },

#endif

  {sys_interactive_timeout.name,(char*) &sys_interactive_timeout,   SHOW_SYS},

  {sys_join_buffer_size.name,   (char*) &sys_join_buffer_size,	    SHOW_SYS},
@@ -544,10 +544,11 @@ struct show_var_st init_vars[]= { 
  {"locked_in_memory",	      (char*) &locked_in_memory,	    SHOW_BOOL},

#endif

  {"log",                     (char*) &opt_log,                     SHOW_BOOL},

  {"log_update",              (char*) &opt_update_log,              SHOW_BOOL},

  {"log_bin",                 (char*) &opt_bin_log,                 SHOW_BOOL},

  {"log_error",               (char*) log_error_file,               SHOW_CHAR},

  {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_MY_BOOL},

  {"log_slow_queries",        (char*) &opt_slow_log,                SHOW_BOOL},

  {"log_update",              (char*) &opt_update_log,              SHOW_BOOL},

  {sys_log_warnings.name,     (char*) &sys_log_warnings,	    SHOW_SYS},

  {sys_long_query_time.name,  (char*) &sys_long_query_time, 	    SHOW_SYS},

  {sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS},
@@ -556,27 +557,27 @@ struct show_var_st init_vars[]= { 
  {sys_max_allowed_packet.name,(char*) &sys_max_allowed_packet,	    SHOW_SYS},

  {sys_max_binlog_cache_size.name,(char*) &sys_max_binlog_cache_size, SHOW_SYS},

  {sys_max_binlog_size.name,    (char*) &sys_max_binlog_size,	    SHOW_SYS},

  {sys_max_connections.name,    (char*) &sys_max_connections,	    SHOW_SYS},

  {sys_max_connect_errors.name, (char*) &sys_max_connect_errors,    SHOW_SYS},

  {sys_max_connections.name,    (char*) &sys_max_connections,	    SHOW_SYS},

  {sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads,   SHOW_SYS},

  {sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size,   SHOW_SYS},

  {sys_max_insert_delayed_threads.name,

   (char*) &sys_max_insert_delayed_threads,   SHOW_SYS},

  {sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size,   SHOW_SYS},

  {sys_max_join_size.name,	(char*) &sys_max_join_size,	    SHOW_SYS},

  {sys_max_relay_log_size.name, (char*) &sys_max_relay_log_size,    SHOW_SYS},

  {sys_max_seeks_for_key.name,  (char*) &sys_max_seeks_for_key,	    SHOW_SYS},

  {sys_max_sort_length.name,	(char*) &sys_max_sort_length,	    SHOW_SYS},

  {sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},

  {sys_max_tmp_tables.name,	(char*) &sys_max_tmp_tables,	    SHOW_SYS},

  {sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},

  {sys_max_write_lock_count.name, (char*) &sys_max_write_lock_count,SHOW_SYS},

  {sys_myisam_max_extra_sort_file_size.name,

   (char*) &sys_myisam_max_extra_sort_file_size,

   SHOW_SYS},

  {sys_myisam_max_sort_file_size.name, (char*) &sys_myisam_max_sort_file_size,

   SHOW_SYS},

  {"myisam_recover_options",  (char*) &myisam_recover_options_str,  SHOW_CHAR_PTR},

  {sys_myisam_repair_threads.name, (char*) &sys_myisam_repair_threads,

   SHOW_SYS},

  {"myisam_recover_options",  (char*) &myisam_recover_options_str,  SHOW_CHAR_PTR},

  {sys_myisam_sort_buffer_size.name, (char*) &sys_myisam_sort_buffer_size, SHOW_SYS},

#ifdef __NT__

  {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_MY_BOOL},
@@ -588,7 +589,6 @@ struct show_var_st init_vars[]= { 
  {sys_new_mode.name,         (char*) &sys_new_mode,                SHOW_SYS},

  {"open_files_limit",	      (char*) &open_files_limit,	    SHOW_LONG},

  {"pid_file",                (char*) pidfile_name,                 SHOW_CHAR},

  {"log_error",               (char*) log_error_file,               SHOW_CHAR},

  {"port",                    (char*) &mysql_port,                  SHOW_INT},

  {"protocol_version",        (char*) &protocol_version,            SHOW_INT},

  {sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size,
@@ -608,10 +608,10 @@ struct show_var_st init_vars[]= { 
  {sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size,	    SHOW_SYS},

  {sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank,       SHOW_SYS},

  {sys_server_id.name,	      (char*) &sys_server_id,		    SHOW_SYS},

  {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout,	    SHOW_SYS},

  {"skip_external_locking",   (char*) &my_disable_locking,          SHOW_MY_BOOL},

  {"skip_networking",         (char*) &opt_disable_networking,      SHOW_BOOL},

  {"skip_show_database",      (char*) &opt_skip_show_db,            SHOW_BOOL},

  {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout,	    SHOW_SYS},

  {sys_slow_launch_time.name, (char*) &sys_slow_launch_time,        SHOW_SYS},

#ifdef HAVE_SYS_UN_H

  {"socket",                  (char*) &mysql_unix_port,             SHOW_CHAR_PTR},
@@ -625,7 +625,6 @@ struct show_var_st init_vars[]= { 
  {"thread_concurrency",      (char*) &concurrency,                 SHOW_LONG},

#endif

  {"thread_stack",            (char*) &thread_stack,                SHOW_LONG},

  {sys_tx_isolation.name,     (char*) &sys_tx_isolation,	    SHOW_SYS},

#ifdef HAVE_TZNAME

  {"timezone",                time_zone,                            SHOW_CHAR},

#endif
@@ -634,6 +633,7 @@ struct show_var_st init_vars[]= { 
  {sys_trans_alloc_block_size.name, (char*) &sys_trans_alloc_block_size,

   SHOW_SYS},

  {sys_trans_prealloc_size.name, (char*) &sys_trans_prealloc_size,  SHOW_SYS},

  {sys_tx_isolation.name,     (char*) &sys_tx_isolation,	    SHOW_SYS},

  {"version",                 server_version,                       SHOW_CHAR},

  {"version_comment",         (char*) MYSQL_COMPILATION_COMMENT,    SHOW_CHAR},

  {sys_os.name,		      (char*) &sys_os,			    SHOW_SYS},