diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-08 16:25:31 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-08 16:25:31 +0200 |
| commit | 890835d9d32c556e56b8b0eb38a2f3933eaa0aee (patch) | |
| tree | 8b5c6d9f69fdbb70c97d9ae07855725bf2143fc2 | |
| parent | f69c62bf435e70191ad3d4be7fa134a5f05b27cf (diff) | |
| download | mariadb-git-890835d9d32c556e56b8b0eb38a2f3933eaa0aee.tar.gz | |
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
| -rw-r--r-- | innobase/include/srv0srv.h | 9 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 5d76ac3d775..82b132a8bac 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -93,7 +93,7 @@ extern ulint srv_max_n_open_files; extern ulint srv_max_dirty_pages_pct; extern ulint srv_force_recovery; -extern ulint srv_thread_concurrency; +extern ulong srv_thread_concurrency; extern ulint srv_max_n_threads; @@ -112,6 +112,7 @@ extern ibool srv_use_checksums; extern ibool srv_set_thread_priorities; extern int srv_query_thread_priority; +extern ulong srv_max_buf_pool_modified_pct; extern ulong srv_max_purge_lag; extern ibool srv_use_awe; extern ibool srv_use_adaptive_hash_indexes; @@ -131,9 +132,9 @@ extern ibool srv_print_innodb_table_monitor; extern ibool srv_lock_timeout_and_monitor_active; extern ibool srv_error_monitor_active; -extern ulint srv_n_spin_wait_rounds; -extern ulint srv_n_free_tickets_to_enter; -extern ulint srv_thread_sleep_delay; +extern ulong srv_n_spin_wait_rounds; +extern ulong srv_n_free_tickets_to_enter; +extern ulong srv_thread_sleep_delay; extern ulint srv_spin_wait_delay; extern ibool srv_priority_boost; diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 538fd6ffc08..41b0594d705 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -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 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) */ ulint srv_data_read = 0; @@ -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 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 structures */ @@ -324,9 +324,9 @@ ibool srv_use_awe = FALSE; ibool srv_use_adaptive_hash_indexes = TRUE; /*-------------------------------------------*/ -ulint srv_n_spin_wait_rounds = 20; -ulint srv_n_free_tickets_to_enter = 500; -ulint srv_thread_sleep_delay = 10000; +ulong srv_n_spin_wait_rounds = 20; +ulong srv_n_free_tickets_to_enter = 500; +ulong srv_thread_sleep_delay = 10000; ulint srv_spin_wait_delay = 5; ibool srv_priority_boost = TRUE; |