Commit 88c893cb authored by unknown's avatar unknown

InnoDB: Win64 portability fixes


innobase/include/srv0srv.h:
  Declare those variables as ulong that are declared in ha_innodb.h
innobase/srv/srv0srv.c:
  Define those variables as ulong that are declared in ha_innodb.h
parent 30f0b316
...@@ -93,7 +93,7 @@ extern ulint srv_max_n_open_files; ...@@ -93,7 +93,7 @@ extern ulint srv_max_n_open_files;
extern ulint srv_max_dirty_pages_pct; extern ulint srv_max_dirty_pages_pct;
extern ulint srv_force_recovery; extern ulint srv_force_recovery;
extern ulint srv_thread_concurrency; extern ulong srv_thread_concurrency;
extern ulint srv_max_n_threads; extern ulint srv_max_n_threads;
...@@ -112,6 +112,7 @@ extern ibool srv_use_checksums; ...@@ -112,6 +112,7 @@ extern ibool srv_use_checksums;
extern ibool srv_set_thread_priorities; extern ibool srv_set_thread_priorities;
extern int srv_query_thread_priority; extern int srv_query_thread_priority;
extern ulong srv_max_buf_pool_modified_pct;
extern ulong srv_max_purge_lag; extern ulong srv_max_purge_lag;
extern ibool srv_use_awe; extern ibool srv_use_awe;
extern ibool srv_use_adaptive_hash_indexes; extern ibool srv_use_adaptive_hash_indexes;
...@@ -131,9 +132,9 @@ extern ibool srv_print_innodb_table_monitor; ...@@ -131,9 +132,9 @@ extern ibool srv_print_innodb_table_monitor;
extern ibool srv_lock_timeout_and_monitor_active; extern ibool srv_lock_timeout_and_monitor_active;
extern ibool srv_error_monitor_active; extern ibool srv_error_monitor_active;
extern ulint srv_n_spin_wait_rounds; extern ulong srv_n_spin_wait_rounds;
extern ulint srv_n_free_tickets_to_enter; extern ulong srv_n_free_tickets_to_enter;
extern ulint srv_thread_sleep_delay; extern ulong srv_thread_sleep_delay;
extern ulint srv_spin_wait_delay; extern ulint srv_spin_wait_delay;
extern ibool srv_priority_boost; extern ibool srv_priority_boost;
......
...@@ -185,7 +185,7 @@ in the buffer pool to all database pages in the buffer pool smaller than ...@@ -185,7 +185,7 @@ in the buffer pool to all database pages in the buffer pool smaller than
the following number. But it is not guaranteed that the value stays below the following number. But it is not guaranteed that the value stays below
that during a time of heavy update/insert activity. */ that during a time of heavy update/insert activity. */
ulint srv_max_buf_pool_modified_pct = 90; ulong srv_max_buf_pool_modified_pct = 90;
/* variable counts amount of data read in total (in bytes) */ /* variable counts amount of data read in total (in bytes) */
ulint srv_data_read = 0; ulint srv_data_read = 0;
...@@ -260,7 +260,7 @@ semaphore contention and convoy problems can occur withput this restriction. ...@@ -260,7 +260,7 @@ semaphore contention and convoy problems can occur withput this restriction.
Value 10 should be good if there are less than 4 processors + 4 disks in the Value 10 should be good if there are less than 4 processors + 4 disks in the
computer. Bigger computers need bigger values. */ computer. Bigger computers need bigger values. */
ulint srv_thread_concurrency = 8; ulong srv_thread_concurrency = 8;
os_fast_mutex_t srv_conc_mutex; /* this mutex protects srv_conc data os_fast_mutex_t srv_conc_mutex; /* this mutex protects srv_conc data
structures */ structures */
...@@ -324,9 +324,9 @@ ibool srv_use_awe = FALSE; ...@@ -324,9 +324,9 @@ ibool srv_use_awe = FALSE;
ibool srv_use_adaptive_hash_indexes = TRUE; ibool srv_use_adaptive_hash_indexes = TRUE;
/*-------------------------------------------*/ /*-------------------------------------------*/
ulint srv_n_spin_wait_rounds = 20; ulong srv_n_spin_wait_rounds = 20;
ulint srv_n_free_tickets_to_enter = 500; ulong srv_n_free_tickets_to_enter = 500;
ulint srv_thread_sleep_delay = 10000; ulong srv_thread_sleep_delay = 10000;
ulint srv_spin_wait_delay = 5; ulint srv_spin_wait_delay = 5;
ibool srv_priority_boost = TRUE; ibool srv_priority_boost = TRUE;
......
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