Commit 696a7bb3 authored by unknown's avatar unknown
Browse files

set_var.cc: 

  Reorder out-of-order system variables


sql/set_var.cc:
  Reorder out-of-order system variables
parent 34f706c0

sql/set_var.cc

+6 −6
Original line number Diff line number Diff line
@@ -764,12 +764,14 @@ struct show_var_st init_vars[]= { 
  {"datadir",                 mysql_real_data_home,                 SHOW_CHAR},

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

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

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

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

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

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

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

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

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

  {sys_engine_condition_pushdown.name, 

   (char*) &sys_engine_condition_pushdown,                          SHOW_SYS},

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

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

  {sys_flush_time.name,        (char*) &sys_flush_time,             SHOW_SYS},
@@ -805,6 +807,7 @@ struct show_var_st init_vars[]= { 
  {"innodb_buffer_pool_awe_mem_mb", (char*) &innobase_buffer_pool_awe_mem_mb, SHOW_LONG },

  {"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONG },

  {"innodb_checksums", (char*) &innobase_use_checksums, SHOW_MY_BOOL},

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

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

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

  {"innodb_data_home_dir",  (char*) &innobase_data_home_dir,	    SHOW_CHAR_PTR},
@@ -827,11 +830,10 @@ struct show_var_st init_vars[]= { 
  {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},

  {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG },

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

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

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

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

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

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

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

#endif

  {sys_interactive_timeout.name,(char*) &sys_interactive_timeout,   SHOW_SYS},
@@ -845,8 +847,8 @@ struct show_var_st init_vars[]= { 
                                                                    SHOW_SYS},

  {"language",                language,                             SHOW_CHAR},

  {"large_files_support",     (char*) &opt_large_files,             SHOW_BOOL},

  {"large_pages",             (char*) &opt_large_pages,             SHOW_MY_BOOL},

  {"large_page_size",         (char*) &opt_large_page_size,         SHOW_INT},

  {"large_pages",             (char*) &opt_large_pages,             SHOW_MY_BOOL},

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

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

#ifdef HAVE_MLOCKALL
@@ -895,8 +897,6 @@ struct show_var_st init_vars[]= { 
#ifdef __NT__

  {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_MY_BOOL},

#endif

  {sys_engine_condition_pushdown.name, 

   (char*) &sys_engine_condition_pushdown,                          SHOW_SYS},

#ifdef HAVE_NDBCLUSTER_DB

  {sys_ndb_autoincrement_prefetch_sz.name,

   (char*) &sys_ndb_autoincrement_prefetch_sz,                      SHOW_SYS},