diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-21 02:44:50 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-21 02:44:50 +0100 |
| commit | c03deada6c0caa1b919608c3c4bdb4115d735cd7 (patch) | |
| tree | a62ba10ae2072fb1d18a5e939abafb56684dda81 | |
| parent | 61e0b38f7fa3daae893eeeae85b1710bdb141e61 (diff) | |
| download | mariadb-git-c03deada6c0caa1b919608c3c4bdb4115d735cd7.tar.gz | |
fix 64 bit Windows build
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 1 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/srv0srv.h | 2 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0srv.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index b6a2c8b22fe..b0dc2c04250 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -20,6 +20,7 @@ # different results. IF(MSVC) +SET(BFD_H_EXISTS 0 CACHE INTERNAL "") SET(HAVE_ACCESS 1 CACHE INTERNAL "") SET(HAVE_AIO_H CACHE INTERNAL "") SET(HAVE_AIO_READ CACHE INTERNAL "") diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 430baaf767a..f3f2100389c 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -12374,7 +12374,7 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, #else #define TMP_STR "No effect for this build." #endif -static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, +static MYSQL_SYSVAR_ULONG(kill_idle_transaction, srv_kill_idle_transaction, PLUGIN_VAR_RQCMDARG, TMP_STR, NULL, NULL, 0, 0, LONG_MAX, 0); diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h index daa0fc3b428..0c864a265e0 100644 --- a/storage/xtradb/include/srv0srv.h +++ b/storage/xtradb/include/srv0srv.h @@ -299,7 +299,7 @@ extern ibool srv_print_latch_waits; extern ulint srv_activity_count; extern ulint srv_fatal_semaphore_wait_threshold; extern ulint srv_dml_needed_delay; -extern lint srv_kill_idle_transaction; +extern ulong srv_kill_idle_transaction; extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs, query threads, and lock table: we allocate diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 8d1dd9827eb..589f632ff5b 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -104,7 +104,7 @@ UNIV_INTERN ulint srv_activity_count = 0; UNIV_INTERN ulint srv_fatal_semaphore_wait_threshold = 600; /**/ -UNIV_INTERN lint srv_kill_idle_transaction = 0; +UNIV_INTERN ulong srv_kill_idle_transaction = 0; /* How much data manipulation language (DML) statements need to be delayed, in microseconds, in order to reduce the lagging of the purge thread. */ |