bk commit into 5.0 tree (marko:1.1813)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1813 05/03/08 16:25:31 marko@stripped +2 -0
  InnoDB: Win64 portability fixes

  innobase/srv/srv0srv.c
    1.86 05/03/08 16:25:23 marko@stripped +5 -5
    Define those variables as ulong that are declared in ha_innodb.h

  innobase/include/srv0srv.h
    1.50 05/03/08 16:25:23 marko@stripped +5 -4
    Declare those variables as ulong that are declared in ha_innodb.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0

--- 1.49/innobase/include/srv0srv.h	Wed Mar  2 11:54:07 2005
+++ 1.50/innobase/include/srv0srv.h	Tue Mar  8 16:25:23 2005
@@ -93,7 +93,7 @@
 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_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_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;
 		

--- 1.85/innobase/srv/srv0srv.c	Wed Mar  2 11:54:07 2005
+++ 1.86/innobase/srv/srv0srv.c	Tue Mar  8 16:25:23 2005
@@ -185,7 +185,7 @@
 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 @@
 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_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;