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

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

Browse Source
This commit is contained in:
unknown 2011-12-15 16:00:07 +01:00
parent 14da1a036c
commit 505a601821
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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",
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,
PLUGIN_VAR_RQCMDARG,
#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.",
#else
"No effect for this build.",
#endif
TMP_STR,
NULL, NULL, 0, 0, LONG_MAX, 0);
#undef TMP_STR
static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,