1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug 600744

Browse Source
This commit is contained in:
Bo Thorsen 2010-07-02 12:25:45 +02:00
parent 73c3a77b6a
commit 9b703c9112
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/xtradb/handler/ha_innodb.cc
View File

@ -10393,7 +10393,7 @@ static MYSQL_SYSVAR_BOOL(recovery_stats, innobase_recovery_stats,
"Output statistics of recovery process after it.", "Output statistics of recovery process after it.",
NULL, NULL, FALSE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_ULONG(use_purge_thread, srv_use_purge_thread, static MYSQL_SYSVAR_ULINT(use_purge_thread, srv_use_purge_thread,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
"Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####", "Number of purge devoted threads. #### over 1 is EXPERIMENTAL ####",
NULL, NULL, 1, 0, 64, 0); NULL, NULL, 1, 0, 64, 0);
@ -10548,7 +10548,7 @@ static MYSQL_SYSVAR_ULONG(stats_auto_update, srv_stats_auto_update,
"(except for ANALYZE TABLE command) 0:disable 1:enable", "(except for ANALYZE TABLE command) 0:disable 1:enable",
NULL, NULL, 1, 0, 1, 0); NULL, NULL, 1, 0, 1, 0);
static MYSQL_SYSVAR_ULONG(stats_update_need_lock, srv_stats_update_need_lock, static MYSQL_SYSVAR_ULINT(stats_update_need_lock, srv_stats_update_need_lock,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Enable/Disable InnoDB's update statistics which needs to lock dictionary. " "Enable/Disable InnoDB's update statistics which needs to lock dictionary. "
"e.g. Data_free.", "e.g. Data_free.",
@ -10728,7 +10728,7 @@ static MYSQL_SYSVAR_ULONG(ibuf_accel_rate, srv_ibuf_accel_rate,
"Tunes amount of insert buffer processing of background, in addition to innodb_io_capacity. (in percentage)", "Tunes amount of insert buffer processing of background, in addition to innodb_io_capacity. (in percentage)",
NULL, NULL, 100, 100, 999999999, 0); NULL, NULL, 100, 100, 999999999, 0);
static MYSQL_SYSVAR_ULONG(checkpoint_age_target, srv_checkpoint_age_target, static MYSQL_SYSVAR_ULINT(checkpoint_age_target, srv_checkpoint_age_target,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Control soft limit of checkpoint age. (0 : not control)", "Control soft limit of checkpoint age. (0 : not control)",
NULL, NULL, 0, 0, ~0UL, 0); NULL, NULL, 0, 0, ~0UL, 0);
@ -10822,12 +10822,12 @@ static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
"Limit the allocated memory for dictionary cache. (0: unlimited)", "Limit the allocated memory for dictionary cache. (0: unlimited)",
NULL, NULL, 0, 0, LONG_MAX, 0); NULL, NULL, 0, 0, LONG_MAX, 0);
static MYSQL_SYSVAR_ULONG(relax_table_creation, srv_relax_table_creation, static MYSQL_SYSVAR_ULINT(relax_table_creation, srv_relax_table_creation,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Relax limitation of column size at table creation as builtin InnoDB.", "Relax limitation of column size at table creation as builtin InnoDB.",
NULL, NULL, 0, 0, 1, 0); NULL, NULL, 0, 0, 1, 0);
static MYSQL_SYSVAR_ULONG(pass_corrupt_table, srv_pass_corrupt_table, static MYSQL_SYSVAR_ULINT(pass_corrupt_table, srv_pass_corrupt_table,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"Pass corruptions of user tables as 'corrupt table' instead of not crashing itself, " "Pass corruptions of user tables as 'corrupt table' instead of not crashing itself, "
"when used with file_per_table. " "when used with file_per_table. "

2
storage/xtradb/include/univ.i
View File

@ -326,10 +326,12 @@ macro ULINTPF. */
typedef unsigned __int64 ulint; typedef unsigned __int64 ulint;
#define ULINTPF "%I64u" #define ULINTPF "%I64u"
typedef __int64 lint; typedef __int64 lint;
#define MYSQL_SYSVAR_ULINT MYSQL_SYSVAR_ULONGLONG
#else #else
typedef unsigned long int ulint; typedef unsigned long int ulint;
#define ULINTPF "%lu" #define ULINTPF "%lu"
typedef long int lint; typedef long int lint;
#define MYSQL_SYSVAR_ULINT MYSQL_SYSVAR_ULONG
#endif #endif
#ifdef __WIN__ #ifdef __WIN__