branches/zip: fix compile errors on Win64

Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.

Approved by: Sunny

include/srv0srv.h

@@ -153,16 +153,16 @@ extern ulint	srv_mem_pool_size;
 extern ulint	srv_lock_table_size;
 
 extern ulint	srv_n_file_io_threads;
-extern ulint	srv_read_ahead_factor;
+extern ulong	srv_read_ahead_factor;
 extern ulint	srv_n_read_io_threads;
 extern ulint	srv_n_write_io_threads;
 
 /* Number of IO operations per second the server can do */
-extern ulint    srv_io_capacity;
+extern ulong    srv_io_capacity;
 /* Returns the number of IO operations that is X percent of the
 capacity. PCT_IO(5) -> returns the number of IO operations that
 is 5% of the max where max is srv_io_capacity.  */
-#define PCT_IO(p) ((ulint) (srv_io_capacity * ((double) p / 100.0)))
+#define PCT_IO(p) ((ulong) (srv_io_capacity * ((double) p / 100.0)))
 
 #ifdef UNIV_LOG_ARCHIVE
 extern ibool	srv_log_archive_on;

srv/srv0srv.c

@@ -214,7 +214,7 @@ within a 64 page extent even if they are accessed out of order or have
 not been accessed at all. This number (which varies from 0 to 64) is
 indicative of the slack that we have when deciding about linear
 readahead. */
-UNIV_INTERN ulint	srv_read_ahead_factor	= 8;
+UNIV_INTERN ulong	srv_read_ahead_factor	= 8;
 
 #ifdef UNIV_LOG_ARCHIVE
 UNIV_INTERN ibool		srv_log_archive_on	= FALSE;
@@ -239,7 +239,7 @@ UNIV_INTERN ulint	srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
 UNIV_INTERN ulint	srv_max_n_open_files	  = 300;
 
 /* Number of IO operations per second the server can do */
-UNIV_INTERN ulint	srv_io_capacity         = 200;
+UNIV_INTERN ulong	srv_io_capacity         = 200;
 
 /* The InnoDB main thread tries to keep the ratio of modified pages
 in the buffer pool to all database pages in the buffer pool smaller than