Commit 61ffbc31 authored by unknown's avatar unknown
Browse files

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

innobase/include/srv0srv.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ extern ulint* srv_data_file_is_raw_partition; 


extern ibool	srv_auto_extend_last_data_file;

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;
@@ -101,7 +101,7 @@ extern ibool srv_use_doublewrite_buf; 
extern ibool    srv_set_thread_priorities;

extern int      srv_query_thread_priority;



extern ulint	srv_max_purge_lag;

extern ulong	srv_max_purge_lag;

/*-------------------------------------------*/



extern ulint	srv_n_rows_inserted;

innobase/srv/srv0srv.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells 
						 the max size auto-extending

						 may increase the last data

						 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

						 many pages to it at a time */

ulint*  srv_data_file_is_raw_partition = NULL;
@@ -849,7 +849,7 @@ srv_general_init(void) 
/*======================= InnoDB Server FIFO queue =======================*/



/* 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