Commit 505a6018 authored by unknown's avatar unknown

Fix XtraDB build on windows (avoid #ifdef inside macro invocation).

parent 14da1a03
...@@ -12369,14 +12369,16 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, ...@@ -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);
static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
PLUGIN_VAR_RQCMDARG,
#ifdef EXTENDED_FOR_KILLIDLE #ifdef EXTENDED_FOR_KILLIDLE
"If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.", #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 #else
"No effect for this build.", #define TMP_STR "No effect for this build."
#endif #endif
static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
PLUGIN_VAR_RQCMDARG,
TMP_STR,
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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment