Commit 61ffbc31 authored by unknown's avatar unknown

InnoDB: Fix compilation errors on IA-64 Windows


innobase/include/srv0srv.h:
  Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
  because ulint and ulong are of different size on Win64.
innobase/srv/srv0srv.c:
  Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
  because ulint and ulong are of different size on Win64.
parent ebdbe9e5
...@@ -50,7 +50,7 @@ extern ulint* srv_data_file_is_raw_partition; ...@@ -50,7 +50,7 @@ extern ulint* srv_data_file_is_raw_partition;
extern ibool srv_auto_extend_last_data_file; extern ibool srv_auto_extend_last_data_file;
extern ulint srv_last_file_size_max; extern ulint srv_last_file_size_max;
extern ulint srv_auto_extend_increment; extern ulong srv_auto_extend_increment;
extern ibool srv_created_new_raw; extern ibool srv_created_new_raw;
...@@ -101,7 +101,7 @@ extern ibool srv_use_doublewrite_buf; ...@@ -101,7 +101,7 @@ extern ibool srv_use_doublewrite_buf;
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 ulint srv_max_purge_lag; extern ulong srv_max_purge_lag;
/*-------------------------------------------*/ /*-------------------------------------------*/
extern ulint srv_n_rows_inserted; extern ulint srv_n_rows_inserted;
......
...@@ -86,7 +86,7 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells ...@@ -86,7 +86,7 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells
the max size auto-extending the max size auto-extending
may increase the last data may increase the last data
file size */ file size */
ulint srv_auto_extend_increment = 8; /* If the last data file is ulong srv_auto_extend_increment = 8; /* If the last data file is
auto-extended, we add this auto-extended, we add this
many pages to it at a time */ many pages to it at a time */
ulint* srv_data_file_is_raw_partition = NULL; ulint* srv_data_file_is_raw_partition = NULL;
...@@ -849,7 +849,7 @@ srv_general_init(void) ...@@ -849,7 +849,7 @@ srv_general_init(void)
/*======================= InnoDB Server FIFO queue =======================*/ /*======================= InnoDB Server FIFO queue =======================*/
/* Maximum allowable purge history length. <=0 means 'infinite'. */ /* Maximum allowable purge history length. <=0 means 'infinite'. */
ulint srv_max_purge_lag = 0; ulong srv_max_purge_lag = 0;
/************************************************************************* /*************************************************************************
Puts an OS thread to wait if there are too many concurrent threads Puts an OS thread to wait if there are too many concurrent threads
......
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