Merge lp:~percona-dev/percona-server/5.1.54-fix-bug602047 into lp:percona-server/release-5.1.54-12

[Yasufumi Kinoshita]

[Valentine Gostev (longbow)]

Test case passes. Manual reproducing - feature works fine.

review: Approve (qa)

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innodb_adjust_defaults.patch'
--- innodb_adjust_defaults.patch	2010-12-16 11:35:26 +0000
+++ innodb_adjust_defaults.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:39:14.000000000 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-30 16:43:26.000000000 +0900
-@@ -11210,7 +11210,7 @@
+@@ -11215,7 +11215,7 @@
  static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####",
@@ -17,7 +17,7 @@
  
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11310,7 +11310,7 @@
+@@ -11315,7 +11315,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
    PLUGIN_VAR_NOCMDARG,
    "Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
@@ -26,7 +26,7 @@
  
  static MYSQL_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
    PLUGIN_VAR_RQCMDARG,
-@@ -11555,7 +11555,7 @@
+@@ -11560,7 +11560,7 @@
  static MYSQL_SYSVAR_ULONG(ibuf_active_contract, srv_ibuf_active_contract,
    PLUGIN_VAR_RQCMDARG,
    "Enable/Disable active_contract of insert buffer. 0:disable 1:enable",
@@ -35,7 +35,7 @@
  
  static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
    PLUGIN_VAR_RQCMDARG,
-@@ -11635,8 +11635,8 @@
+@@ -11640,8 +11640,8 @@
  };
  static MYSQL_SYSVAR_ENUM(adaptive_checkpoint, srv_adaptive_checkpoint,
    PLUGIN_VAR_RQCMDARG,
 
=== modified file 'innodb_admin_command_base.patch'
--- innodb_admin_command_base.patch	2010-12-16 11:35:26 +0000
+++ innodb_admin_command_base.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:27:30.222410116 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:27:44.073104773 +0900
-@@ -11534,6 +11534,7 @@
+@@ -11539,6 +11539,7 @@
  i_s_innodb_cmpmem_reset,
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
 
=== modified file 'innodb_buffer_pool_shm.patch'
--- innodb_buffer_pool_shm.patch	2010-12-16 11:35:26 +0000
+++ innodb_buffer_pool_shm.patch	2011-02-08 02:15:10 +0000
@@ -683,7 +683,7 @@
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11405,6 +11407,16 @@
+@@ -11410,6 +11412,16 @@
    "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
    NULL, NULL, 128*1024*1024L, 32*1024*1024L, LONGLONG_MAX, 1024*1024L);
  
@@ -700,7 +700,7 @@
  static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
    PLUGIN_VAR_RQCMDARG,
    "Helps in performance tuning in heavily concurrent environments.",
-@@ -11680,6 +11692,8 @@
+@@ -11685,6 +11697,8 @@
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
 
=== modified file 'innodb_extend_slow.patch'
--- innodb_extend_slow.patch	2011-02-02 14:49:16 +0000
+++ innodb_extend_slow.patch	2011-02-08 02:15:10 +0000
@@ -428,7 +428,7 @@
  /*********************************************************************//**
  Construct ha_innobase handler. */
  UNIV_INTERN
-@@ -8940,6 +8976,25 @@
+@@ -8945,6 +8981,25 @@
  	statement has ended */
  
  	if (trx->n_mysql_tables_in_use == 0) {
@@ -766,7 +766,7 @@
  
  	if ((ulint)ret == n) {
  
-@@ -3642,10 +3677,11 @@
+@@ -3642,10 +3676,11 @@
  				(can be used to identify a completed
  				aio operation); ignored if mode is
  				OS_AIO_SYNC */
@@ -779,7 +779,7 @@
  {
  	os_aio_array_t*	array;
  	os_aio_slot_t*	slot;
-@@ -3687,8 +3723,8 @@
+@@ -3687,8 +3722,8 @@
  		wait in the Windows case. */
  
  		if (type == OS_FILE_READ) {
@@ -790,7 +790,7 @@
  		}
  
  		ut_a(type == OS_FILE_WRITE);
-@@ -3721,6 +3757,11 @@
+@@ -3721,6 +3756,11 @@
  		ut_error;
  	}
  
 
=== modified file 'innodb_fast_checksum.patch'
--- innodb_fast_checksum.patch	2010-12-16 11:35:26 +0000
+++ innodb_fast_checksum.patch	2011-02-08 02:15:10 +0000
@@ -178,7 +178,7 @@
  
  #ifdef HAVE_LARGE_PAGES
          if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11105,6 +11107,15 @@
+@@ -11110,6 +11112,15 @@
    "Disable with --skip-innodb-checksums.",
    NULL, NULL, TRUE);
  
@@ -194,7 +194,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11597,6 +11608,7 @@
+@@ -11602,6 +11613,7 @@
    MYSQL_SYSVAR(autoextend_increment),
    MYSQL_SYSVAR(buffer_pool_size),
    MYSQL_SYSVAR(checksums),
 
=== modified file 'innodb_fast_shutdown.patch'
--- innodb_fast_shutdown.patch	2010-12-13 11:43:12 +0000
+++ innodb_fast_shutdown.patch	2011-02-08 02:15:10 +0000
@@ -212,7 +212,7 @@
  
  	if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
  		goto exit_func;
-@@ -2770,7 +2773,7 @@
+@@ -2773,7 +2776,7 @@
  		if (!skip_sleep) {
  		if (next_itr_time > cur_time) {
  
@@ -221,7 +221,7 @@
  			srv_main_sleeps++;
  
  			/*
-@@ -3476,9 +3479,10 @@
+@@ -3480,9 +3483,10 @@
  		mutex_exit(&kernel_mutex);
  
  		sleep_ms = 10;
 
=== modified file 'innodb_files_extend.patch'
--- innodb_files_extend.patch	2011-02-02 14:49:16 +0000
+++ innodb_files_extend.patch	2011-02-08 02:15:10 +0000
@@ -187,7 +187,7 @@
  #ifndef MYSQL_SERVER
  	innodb_overwrite_relay_log_info = FALSE;
  #endif
-@@ -7004,9 +7063,9 @@
+@@ -7009,9 +7068,9 @@
  				| DICT_TF_COMPACT
  				| DICT_TF_FORMAT_ZIP
  				<< DICT_TF_FORMAT_SHIFT;
@@ -200,7 +200,7 @@
  		}
  	}
  
-@@ -11116,6 +11175,16 @@
+@@ -11121,6 +11180,16 @@
    "#### Attention: The checksum is not compatible for normal or disabled version! ####",
    NULL, NULL, FALSE);
  
@@ -217,7 +217,7 @@
  static MYSQL_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
    PLUGIN_VAR_READONLY,
    "The common part for InnoDB table spaces.",
-@@ -11604,6 +11673,8 @@
+@@ -11609,6 +11678,8 @@
    NULL, NULL, 0, 0, 1, 0);
  
  static struct st_mysql_sys_var* innobase_system_variables[]= {
 
=== modified file 'innodb_fix_misc.patch'
--- innodb_fix_misc.patch	2011-02-02 14:49:16 +0000
+++ innodb_fix_misc.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:50:59.626327847 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:55:20.281021252 +0900
-@@ -11770,7 +11770,7 @@
+@@ -11775,7 +11775,7 @@
    &innobase_storage_engine,
    innobase_hton_name,
    "Innobase Oy",
 
=== modified file 'innodb_lru_dump_restore.patch'
--- innodb_lru_dump_restore.patch	2011-02-02 14:49:16 +0000
+++ innodb_lru_dump_restore.patch	2011-02-08 02:15:10 +0000
@@ -409,7 +409,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 09:57:56.486228425 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-10-01 10:00:13.292228546 +0900
-@@ -11473,6 +11473,12 @@
+@@ -11478,6 +11478,12 @@
    "Limit the allocated memory for dictionary cache. (0: unlimited)",
    NULL, NULL, 0, 0, LONG_MAX, 0);
  
@@ -422,7 +422,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11555,6 +11561,7 @@
+@@ -11560,6 +11566,7 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
 
=== modified file 'innodb_pass_corrupt_table.patch'
--- innodb_pass_corrupt_table.patch	2011-02-02 14:49:16 +0000
+++ innodb_pass_corrupt_table.patch	2011-02-08 02:15:10 +0000
@@ -899,7 +899,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -5852,6 +5903,10 @@
+@@ -5857,6 +5908,10 @@
  {
  	DBUG_ENTER("change_active_index");
  
@@ -910,7 +910,7 @@
  	ut_ad(user_thd == ha_thd());
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
-@@ -5942,6 +5997,10 @@
+@@ -5947,6 +6002,10 @@
  
  	DBUG_ENTER("general_fetch");
  
@@ -921,7 +921,7 @@
  	ut_a(prebuilt->trx == thd_to_trx(user_thd));
  
  	innodb_srv_conc_enter_innodb(prebuilt->trx);
-@@ -5951,6 +6010,10 @@
+@@ -5956,6 +6015,10 @@
  
  	innodb_srv_conc_exit_innodb(prebuilt->trx);
  
@@ -932,7 +932,7 @@
  	switch (ret) {
  	case DB_SUCCESS:
  		error = 0;
-@@ -7201,6 +7264,10 @@
+@@ -7206,6 +7269,10 @@
  		DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
  	}
  
@@ -943,7 +943,7 @@
  	/* Truncate the table in InnoDB */
  
  	error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
-@@ -7209,6 +7276,10 @@
+@@ -7214,6 +7281,10 @@
  		goto fallback;
  	}
  
@@ -954,7 +954,7 @@
  	error = convert_error_code_to_mysql(error, prebuilt->table->flags,
  					    NULL);
  
-@@ -7721,6 +7792,16 @@
+@@ -7726,6 +7797,16 @@
  	return(ranges + (double) rows / (double) total_rows * time_for_scan);
  }
  
@@ -971,7 +971,7 @@
  /*********************************************************************//**
  Calculates the key number used inside MySQL for an Innobase index. We will
  first check the "index translation table" for a match of the index to get
-@@ -7842,7 +7923,7 @@
+@@ -7847,7 +7928,7 @@
  	ib_table = prebuilt->table;
  
  	if (flag & HA_STATUS_TIME) {
@@ -980,7 +980,7 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
-@@ -8133,10 +8214,18 @@
+@@ -8138,10 +8219,18 @@
  	THD*		thd,		/*!< in: connection thread handle */
  	HA_CHECK_OPT*	check_opt)	/*!< in: currently ignored */
  {
@@ -999,7 +999,7 @@
  	return(0);
  }
  
-@@ -8318,6 +8407,10 @@
+@@ -8323,6 +8412,10 @@
  		my_error(ER_QUERY_INTERRUPTED, MYF(0));
  	}
  
@@ -1010,7 +1010,7 @@
  	DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
  }
  
-@@ -9043,6 +9136,10 @@
+@@ -9048,6 +9141,10 @@
  
  	update_thd(thd);
  
@@ -1021,7 +1021,7 @@
  	if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
  		ut_print_timestamp(stderr);
  		fprintf(stderr,
-@@ -11487,6 +11584,14 @@
+@@ -11492,6 +11589,14 @@
    "0 (the default) disables automatic dumps.",
    NULL, NULL, 0, 0, UINT_MAX32, 0);
  
@@ -1036,7 +1036,7 @@
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11572,6 +11677,7 @@
+@@ -11577,6 +11682,7 @@
    MYSQL_SYSVAR(io_capacity),
    MYSQL_SYSVAR(auto_lru_dump),
    MYSQL_SYSVAR(use_purge_thread),
 
=== modified file 'innodb_purge_thread.patch'
--- innodb_purge_thread.patch	2011-02-02 14:49:16 +0000
+++ innodb_purge_thread.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:23:31.022060427 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:25:49.004020662 +0900
-@@ -10974,6 +10974,11 @@
+@@ -10979,6 +10979,11 @@
    "Output statistics of recovery process after it.",
    NULL, NULL, FALSE);
  
@@ -20,7 +20,7 @@
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11497,6 +11502,7 @@
+@@ -11502,6 +11507,7 @@
  #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
    MYSQL_SYSVAR(read_ahead_threshold),
    MYSQL_SYSVAR(io_capacity),
 
=== modified file 'innodb_recovery_patches.patch'
--- innodb_recovery_patches.patch	2010-12-16 11:35:26 +0000
+++ innodb_recovery_patches.patch	2011-02-08 02:15:10 +0000
@@ -127,7 +127,7 @@
  	srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
  	srv_use_checksums = (ibool) innobase_use_checksums;
  
-@@ -10960,6 +10964,16 @@
+@@ -10965,6 +10969,16 @@
    "don't use the datafile for normal mysqld or ibbackup! ####",
    NULL, NULL, FALSE);
  
@@ -144,7 +144,7 @@
  static MYSQL_SYSVAR_BOOL(overwrite_relay_log_info, innobase_overwrite_relay_log_info,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
    "During InnoDB crash recovery on slave overwrite relay-log.info "
-@@ -11412,6 +11426,8 @@
+@@ -11417,6 +11431,8 @@
    MYSQL_SYSVAR(data_home_dir),
    MYSQL_SYSVAR(doublewrite),
    MYSQL_SYSVAR(extra_undoslots),
 
=== modified file 'innodb_separate_doublewrite.patch'
--- innodb_separate_doublewrite.patch	2011-02-02 14:49:16 +0000
+++ innodb_separate_doublewrite.patch	2011-02-08 02:15:10 +0000
@@ -357,7 +357,7 @@
  	srv_extra_undoslots = (ibool) innobase_extra_undoslots;
  
  	srv_use_sys_stats_table = (ibool) innobase_use_sys_stats_table;
-@@ -11321,6 +11324,11 @@
+@@ -11326,6 +11329,11 @@
    "Path to individual files and their sizes.",
    NULL, NULL, NULL);
  
@@ -369,7 +369,7 @@
  static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
    "The AUTOINC lock modes supported by InnoDB:               "
-@@ -11487,6 +11495,7 @@
+@@ -11492,6 +11500,7 @@
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
    MYSQL_SYSVAR(data_file_path),
 
=== modified file 'innodb_show_lock_name.patch'
--- innodb_show_lock_name.patch	2011-02-02 14:49:16 +0000
+++ innodb_show_lock_name.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:29:12.539982446 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:29:24.322059309 +0900
-@@ -9233,8 +9233,8 @@
+@@ -9238,8 +9238,8 @@
  			rw_lock_wait_time += mutex->lspent_time;
  		}
  #else /* UNIV_DEBUG */
@@ -19,7 +19,7 @@
  		buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
  				     (ulong) mutex->count_os_wait);
  
-@@ -9249,9 +9249,8 @@
+@@ -9254,9 +9254,8 @@
  
  	if (block_mutex) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -31,7 +31,7 @@
  		buf2len = (uint) my_snprintf(buf2, sizeof buf2,
  					     "os_waits=%lu",
  					     (ulong) block_mutex_oswait_count);
-@@ -9280,8 +9279,8 @@
+@@ -9285,8 +9284,8 @@
  			continue;
  		}
  
@@ -42,7 +42,7 @@
  		buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
  				      (ulong) lock->count_os_wait);
  
-@@ -9295,9 +9294,8 @@
+@@ -9300,9 +9299,8 @@
  
  	if (block_lock) {
  		buf1len = (uint) my_snprintf(buf1, sizeof buf1,
 
=== modified file 'innodb_show_sys_tables.patch'
--- innodb_show_sys_tables.patch	2010-12-16 11:35:26 +0000
+++ innodb_show_sys_tables.patch	2011-02-08 02:15:10 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:45:46.194411503 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-27 16:49:26.171990559 +0900
-@@ -11793,6 +11793,9 @@
+@@ -11798,6 +11798,9 @@
  i_s_innodb_table_stats,
  i_s_innodb_index_stats,
  i_s_innodb_admin_command,
 
=== modified file 'innodb_stats.patch'
--- innodb_stats.patch	2011-02-02 14:49:16 +0000
+++ innodb_stats.patch	2011-02-08 02:15:10 +0000
@@ -1128,7 +1128,19 @@
  	innodb_srv_conc_exit_innodb(trx);
  
  	error = convert_error_code_to_mysql(
-@@ -5897,6 +5912,11 @@
+@@ -5688,6 +5703,11 @@
+ 	case DB_SUCCESS:
+ 		error = 0;
+ 		table->status = 0;
++#ifdef EXTENDED_FOR_USERSTAT
++		rows_read++;
++		if (active_index < MAX_KEY)
++			index_rows_read[active_index]++;
++#endif
+ 		break;
+ 	case DB_RECORD_NOT_FOUND:
+ 		error = HA_ERR_KEY_NOT_FOUND;
+@@ -5897,6 +5917,11 @@
  	case DB_SUCCESS:
  		error = 0;
  		table->status = 0;
@@ -1140,7 +1152,7 @@
  		break;
  	case DB_RECORD_NOT_FOUND:
  		error = HA_ERR_END_OF_FILE;
-@@ -7783,11 +7803,31 @@
+@@ -7783,11 +7808,31 @@
  			/* In sql_show we call with this flag: update
  			then statistics so that they are up-to-date */
  
@@ -1173,7 +1185,7 @@
  
  			prebuilt->trx->op_info = "returning various info to MySQL";
  		}
-@@ -7865,7 +7905,7 @@
+@@ -7865,7 +7910,7 @@
  		are asked by MySQL to avoid locking. Another reason to
  		avoid the call is that it uses quite a lot of CPU.
  		See Bug#38185. */
@@ -1182,7 +1194,7 @@
  			/* We do not update delete_length if no
  			locking is requested so the "old" value can
  			remain. delete_length is initialized to 0 in
-@@ -11045,6 +11085,45 @@
+@@ -11045,6 +11090,45 @@
    "The number of index pages to sample when calculating statistics (default 8)",
    NULL, NULL, 8, 1, ~0ULL, 0);
  
@@ -1228,7 +1240,7 @@
  static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
    PLUGIN_VAR_OPCMDARG,
    "Enable InnoDB adaptive hash index (enabled by default).  "
-@@ -11363,6 +11442,10 @@
+@@ -11363,6 +11447,10 @@
    MYSQL_SYSVAR(overwrite_relay_log_info),
    MYSQL_SYSVAR(rollback_on_timeout),
    MYSQL_SYSVAR(stats_on_metadata),
@@ -1239,7 +1251,7 @@
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
    MYSQL_SYSVAR(replication_delay),
-@@ -11427,6 +11510,8 @@
+@@ -11427,6 +11515,8 @@
  i_s_innodb_cmp_reset,
  i_s_innodb_cmpmem,
  i_s_innodb_cmpmem_reset,