Commit f2afed0d authored by unknown's avatar unknown
Browse files

After merge fixes

parents d2ead18b 61ffbc31

innobase/include/srv0srv.h

+2 −4
Original line number Diff line number Diff line
@@ -52,7 +52,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;
@@ -111,11 +111,9 @@ 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 ibool	srv_use_awe;

extern ibool	srv_use_adaptive_hash_indexes;



extern ulint	srv_max_purge_lag;

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



extern ulint	srv_n_rows_inserted;

innobase/srv/srv0srv.c

+3 −4
Original line number Diff line number Diff line
@@ -96,7 +96,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;
@@ -266,9 +266,6 @@ disable adaptive hash indexes */ 
ibool	srv_use_awe			= FALSE;

ibool	srv_use_adaptive_hash_indexes 	= TRUE;



/* Maximum allowable purge history length.  <=0 means 'infinite'. */

ulint	srv_max_purge_lag		= 0;



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

ulint	srv_n_spin_wait_rounds	= 20;

ulint	srv_spin_wait_delay	= 5;
@@ -881,6 +878,8 @@ srv_general_init(void) 


/*======================= InnoDB Server FIFO queue =======================*/



/* Maximum allowable purge history length.  <=0 means 'infinite'. */

ulong	srv_max_purge_lag		= 0;



/*************************************************************************

Puts an OS thread to wait if there are too many concurrent threads