Fix XtraDB build on windows (avoid #ifdef inside macro invocation).
This commit is contained in:
parent
14da1a036c
commit
505a601821
@ -12369,14 +12369,16 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
|
|||||||
"Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
|
"Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
|
||||||
NULL, NULL, 500L, 1L, ~0L, 0);
|
NULL, NULL, 500L, 1L, ~0L, 0);
|
||||||
|
|
||||||
|
#ifdef EXTENDED_FOR_KILLIDLE
|
||||||
|
#define TMP_STR "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB."
|
||||||
|
#else
|
||||||
|
#define TMP_STR "No effect for this build."
|
||||||
|
#endif
|
||||||
static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
|
static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
|
||||||
PLUGIN_VAR_RQCMDARG,
|
PLUGIN_VAR_RQCMDARG,
|
||||||
#ifdef EXTENDED_FOR_KILLIDLE
|
TMP_STR,
|
||||||
"If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.",
|
|
||||||
#else
|
|
||||||
"No effect for this build.",
|
|
||||||
#endif
|
|
||||||
NULL, NULL, 0, 0, LONG_MAX, 0);
|
NULL, NULL, 0, 0, LONG_MAX, 0);
|
||||||
|
#undef TMP_STR
|
||||||
|
|
||||||
static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
|
static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
|
||||||
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
|
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user