5.3->5.5 merge

3 files changed, 10 insertions, 10 deletions

diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index e0a4f77ddd6..f70dc7a0f8a 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -12095,7 +12095,7 @@ static MYSQL_SYSVAR_ULONGLONG(stats_sample_pages, srv_stats_sample_pages,
   "The number of index pages to sample when calculating statistics (default 8)",
   NULL, NULL, 8, 1, ~0ULL, 0);
 
-static MYSQL_SYSVAR_ULONG(stats_auto_update, srv_stats_auto_update,
+static MYSQL_SYSVAR_ULINT(stats_auto_update, srv_stats_auto_update,
   PLUGIN_VAR_RQCMDARG,
   "Enable/Disable InnoDB's auto update statistics of indexes. "
   "(except for ANALYZE TABLE command) 0:disable 1:enable",
@@ -12121,7 +12121,7 @@ static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled,
   "Disable with --skip-innodb-adaptive-hash-index.",
   NULL, innodb_adaptive_hash_index_update, TRUE);
 
-static MYSQL_SYSVAR_ULONG(adaptive_hash_index_partitions, btr_search_index_num,
+static MYSQL_SYSVAR_ULINT(adaptive_hash_index_partitions, btr_search_index_num,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)",
   NULL, NULL, 1, 1, sizeof(ulint) * 8, 0);
@@ -12338,7 +12338,7 @@ static MYSQL_SYSVAR_ULINT(checkpoint_age_target, srv_checkpoint_age_target,
   "Control soft limit of checkpoint age. (0 : not control)",
   NULL, NULL, 0, 0, ~0UL, 0);
 
-static MYSQL_SYSVAR_ULONG(flush_neighbor_pages, srv_flush_neighbor_pages,
+static MYSQL_SYSVAR_ULINT(flush_neighbor_pages, srv_flush_neighbor_pages,
   PLUGIN_VAR_RQCMDARG,
   "Enable/Disable flushing also neighbor pages. 0:disable 1:enable",
   NULL, NULL, 1, 0, 1, 0);
@@ -12412,7 +12412,7 @@ static MYSQL_SYSVAR_ULONG(import_table_from_xtrabackup, srv_expand_import,
   "Enable/Disable converting automatically *.ibd files when import tablespace.",
   NULL, NULL, 0, 0, 1, 0);
 
-static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
+static MYSQL_SYSVAR_ULINT(dict_size_limit, srv_dict_size_limit,
   PLUGIN_VAR_RQCMDARG,
   "Limit the allocated memory for dictionary cache. (0: unlimited)",
   NULL, NULL, 0, 0, LONG_MAX, 0);
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h
index 1c00e219cd3..2de0ed190ab 100644
--- a/storage/xtradb/include/srv0srv.h
+++ b/storage/xtradb/include/srv0srv.h
@@ -240,11 +240,11 @@ extern ulong	srv_ibuf_accel_rate;
 extern ulint	srv_checkpoint_age_target;
 extern ulint	srv_flush_neighbor_pages;
 extern ulint	srv_deprecated_enable_unsafe_group_commit;
-extern ulint	srv_read_ahead;
-extern ulint	srv_adaptive_flushing_method;
+extern ulong	srv_read_ahead;
+extern ulong	srv_adaptive_flushing_method;
 
 extern ulong	srv_expand_import;
-extern ulint	srv_pass_corrupt_table;
+extern ulong	srv_pass_corrupt_table;
 
 extern ulint	srv_dict_size_limit;
 
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c
index 1b38c9cef7e..0606de2e89a 100644
--- a/storage/xtradb/srv/srv0srv.c
+++ b/storage/xtradb/srv/srv0srv.c
@@ -434,10 +434,10 @@ UNIV_INTERN ulint	srv_checkpoint_age_target = 0;
 UNIV_INTERN ulint	srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */
 
 UNIV_INTERN ulint	srv_deprecated_enable_unsafe_group_commit = 0;
-UNIV_INTERN ulint	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
-UNIV_INTERN ulint	srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
+UNIV_INTERN ulong	srv_read_ahead = 3; /* 1: random  2: linear  3: Both */
+UNIV_INTERN ulong	srv_adaptive_flushing_method = 0; /* 0: native  1: estimate  2: keep_average */
 
-UNIV_INTERN ulint	srv_expand_import = 0; /* 0:disable 1:enable */
+UNIV_INTERN ulong	srv_expand_import = 0; /* 0:disable 1:enable */
 UNIV_INTERN ulong	srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
 
 UNIV_INTERN ulint	srv_dict_size_limit = 0;