diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-15 16:00:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-15 16:00:07 +0100 |
| commit | 505a6018212751b311c2ded88ffe200867729e86 (patch) | |
| tree | 9d8ac48f441ca39d1e560efddfb43287a538d47a | |
| parent | 14da1a036cf7f4d7cd1423011c3a797c4fb02516 (diff) | |
| download | mariadb-git-505a6018212751b311c2ded88ffe200867729e86.tar.gz | |
Fix XtraDB build on windows (avoid #ifdef inside macro invocation).
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index b89fb4f9c7e..430baaf767a 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -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); -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.", +#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 - "No effect for this build.", +#define TMP_STR "No effect for this build." #endif +static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, + PLUGIN_VAR_RQCMDARG, + 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, |