bzr commit into mysql-5.1 branch (mikael:2848)

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/prepare-commit-mutex/

 2848 Mikael Ronstrom	2009-05-08
      Fixed a bug in definition of innodb-support-ibbackup config variable
            causing problems in Windows 64-bit environments
      modified:
        storage/innobase/handler/ha_innodb.cc
        storage/innobase/srv/srv0srv.c

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2009-05-08 12:56:31 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2009-05-08 13:07:46 +0000
@@ -98,7 +98,7 @@ static const long AUTOINC_NO_LOCKING = 2
 
 static long innobase_mirrored_log_groups, innobase_log_files_in_group,
 	innobase_log_buffer_size, innobase_buffer_pool_awe_mem_mb,
-	innobase_additional_mem_pool_size,
+	innobase_additional_mem_pool_size, innobase_support_ibbackup,
 	innobase_lock_wait_timeout, innobase_force_recovery,
 	innobase_open_files, innobase_autoinc_lock_mode;
 
@@ -1694,6 +1694,7 @@ innobase_init(
 
         srv_thread_concurrency_timer_based =
           (ibool) innobase_thread_concurrency_timer_based;
+        srv_support_ibbackup = (ulint) innobase_support_ibbackup;
 
 #ifdef UNIV_LOG_ARCHIVE
 	srv_log_archive_on = (ulint) innobase_log_archive;
@@ -8371,10 +8372,10 @@ static MYSQL_SYSVAR_BOOL(stats_on_metada
   "Enable statistics gathering for metadata commands such as SHOW TABLE STATUS (on by default)",
   NULL, NULL, TRUE);
 
-static MYSQL_SYSVAR_ULONG(support_ibbackup, srv_support_ibbackup,
+static MYSQL_SYSVAR_LONG(support_ibbackup, innobase_support_ibbackup,
   PLUGIN_VAR_RQCMDARG,
   "Use of prepare_commit_mutex to support ibbackup",
-  NULL, NULL, 1, 0, 2, 0);
+  NULL, NULL, (long)1, (long)0, (long)2, (long)0);
 
 static MYSQL_SYSVAR_BOOL(adaptive_hash_index, innobase_adaptive_hash_index,
   PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,

=== modified file 'storage/innobase/srv/srv0srv.c'
--- a/storage/innobase/srv/srv0srv.c	2009-05-08 12:56:31 +0000
+++ b/storage/innobase/srv/srv0srv.c	2009-05-08 13:07:46 +0000
@@ -172,7 +172,7 @@ ulint	srv_mem_pool_size	= ULINT_MAX;	/* 
 ulint	srv_lock_table_size	= ULINT_MAX;
 
 
-ulint   srv_io_capacity         = ULINT_MAX;    /* Number of IO operations per
+ulint   srv_io_capacity         = 200;          /* Number of IO operations per
                                                    second the server can do */
 
 ibool   srv_extra_dirty_writes = TRUE;  /* Write dirty pages to disk when pct
@@ -190,7 +190,7 @@ ibool	srv_archive_recovery	= 0;
 dulint	srv_archive_recovery_limit_lsn;
 #endif /* UNIV_LOG_ARCHIVE */
 
-ulint	srv_lock_wait_timeout	= 1024 * 1024 * 1024;
+ulint	srv_lock_wait_timeout	= 1024*1024*1024;
 
 /* This parameter is used to throttle the number of insert buffers that are
 merged in a batch. By increasing this parameter on a faster disk you can