Commit a9992fd0 authored by unknown's avatar unknown
Browse files

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

into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
parents 8d173601 a02f8735

sql/ha_innodb.cc

+4 −4
Original line number Diff line number Diff line
@@ -303,16 +303,16 @@ struct show_var_st innodb_status_variables[]= { 
  (char*) &export_vars.innodb_pages_read,                 SHOW_LONG},

  {"pages_written",

  (char*) &export_vars.innodb_pages_written,              SHOW_LONG},

  {"row_lock_waits",

  (char*) &export_vars.innodb_row_lock_waits,             SHOW_LONG},

  {"row_lock_current_waits",

  (char*) &export_vars.innodb_row_lock_current_waits,     SHOW_LONG},

  {"row_lock_time",

  (char*) &export_vars.innodb_row_lock_time,              SHOW_LONGLONG},

  {"row_lock_time_max",

  (char*) &export_vars.innodb_row_lock_time_max,          SHOW_LONG},

  {"row_lock_time_avg",

  (char*) &export_vars.innodb_row_lock_time_avg,          SHOW_LONG},

  {"row_lock_time_max",

  (char*) &export_vars.innodb_row_lock_time_max,          SHOW_LONG},

  {"row_lock_waits",

  (char*) &export_vars.innodb_row_lock_waits,             SHOW_LONG},

  {"rows_deleted",

  (char*) &export_vars.innodb_rows_deleted,               SHOW_LONG},

  {"rows_inserted",

sql/mysqld.cc

+6 −6
Original line number Diff line number Diff line
@@ -5798,13 +5798,13 @@ struct show_var_st status_vars[]= { 
  {"Com_savepoint",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SAVEPOINT]), SHOW_LONG_STATUS},

  {"Com_select",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SELECT]), SHOW_LONG_STATUS},

  {"Com_set_option",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SET_OPTION]), SHOW_LONG_STATUS},

  {"Com_show_binlogs",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOGS]), SHOW_LONG_STATUS},

  {"Com_show_binlog_events",   (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOG_EVENTS]), SHOW_LONG_STATUS},

  {"Com_show_binlogs",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOGS]), SHOW_LONG_STATUS},

  {"Com_show_charsets",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CHARSETS]), SHOW_LONG_STATUS},

  {"Com_show_collations",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_COLLATIONS]), SHOW_LONG_STATUS},

  {"Com_show_column_types",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_COLUMN_TYPES]), SHOW_LONG_STATUS},

  {"Com_show_create_table",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CREATE]), SHOW_LONG_STATUS},

  {"Com_show_create_db",       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CREATE_DB]), SHOW_LONG_STATUS},

  {"Com_show_create_table",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CREATE]), SHOW_LONG_STATUS},

  {"Com_show_databases",       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_DATABASES]), SHOW_LONG_STATUS},

  {"Com_show_errors",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_ERRORS]), SHOW_LONG_STATUS},

  {"Com_show_fields",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_FIELDS]), SHOW_LONG_STATUS},
@@ -5827,12 +5827,12 @@ struct show_var_st status_vars[]= { 
  {"Com_show_warnings",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_WARNS]), SHOW_LONG_STATUS},

  {"Com_slave_start",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SLAVE_START]), SHOW_LONG_STATUS},

  {"Com_slave_stop",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SLAVE_STOP]), SHOW_LONG_STATUS},

  {"Com_stmt_prepare",         (char*) offsetof(STATUS_VAR, com_stmt_prepare), SHOW_LONG_STATUS},

  {"Com_stmt_close",           (char*) offsetof(STATUS_VAR, com_stmt_close), SHOW_LONG_STATUS},

  {"Com_stmt_execute",         (char*) offsetof(STATUS_VAR, com_stmt_execute), SHOW_LONG_STATUS},

  {"Com_stmt_fetch",           (char*) offsetof(STATUS_VAR, com_stmt_fetch), SHOW_LONG_STATUS},

  {"Com_stmt_send_long_data",  (char*) offsetof(STATUS_VAR, com_stmt_send_long_data), SHOW_LONG_STATUS},

  {"Com_stmt_prepare",         (char*) offsetof(STATUS_VAR, com_stmt_prepare), SHOW_LONG_STATUS},

  {"Com_stmt_reset",           (char*) offsetof(STATUS_VAR, com_stmt_reset), SHOW_LONG_STATUS},

  {"Com_stmt_close",           (char*) offsetof(STATUS_VAR, com_stmt_close), SHOW_LONG_STATUS},

  {"Com_stmt_send_long_data",  (char*) offsetof(STATUS_VAR, com_stmt_send_long_data), SHOW_LONG_STATUS},

  {"Com_truncate",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_TRUNCATE]), SHOW_LONG_STATUS},

  {"Com_unlock_tables",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_UNLOCK_TABLES]), SHOW_LONG_STATUS},

  {"Com_update",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_UPDATE]), SHOW_LONG_STATUS},
@@ -5904,8 +5904,8 @@ struct show_var_st status_vars[]= { 
  {"Select_range_check",       (char*) offsetof(STATUS_VAR, select_range_check_count), SHOW_LONG_STATUS},

  {"Select_scan",	       (char*) offsetof(STATUS_VAR, select_scan_count), SHOW_LONG_STATUS},

  {"Slave_open_temp_tables",   (char*) &slave_open_temp_tables, SHOW_LONG},

  {"Slave_running",            (char*) 0,                       SHOW_SLAVE_RUNNING},

  {"Slave_retried_transactions",(char*) 0,                      SHOW_SLAVE_RETRIED_TRANS},

  {"Slave_running",            (char*) 0,                       SHOW_SLAVE_RUNNING},

  {"Slow_launch_threads",      (char*) &slow_launch_threads,    SHOW_LONG},

  {"Slow_queries",             (char*) offsetof(STATUS_VAR, long_query_count), SHOW_LONG_STATUS},

  {"Sort_merge_passes",	       (char*) offsetof(STATUS_VAR, filesort_merge_passes), SHOW_LONG_STATUS},

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},