bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2705)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:monty@stripped

 2705 Guilhem Bichot	2008-12-04
      Fixing Valgrind error: deadlock detector was set to random; seen in many InnoDB tests like innodb-replace.test
modified:
  storage/innobase/handler/ha_innodb.cc

per-file messages:
  storage/innobase/handler/ha_innodb.cc
    Fixing Valgrind error: deadlock detector was set to random. Making the recently added lines closer
    to the InnoDB style (tabs not spaces)
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2008-12-02 22:02:52 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2008-12-04 21:17:47 +0000
@@ -1405,6 +1405,7 @@ innobase_init(
 	int		err;
 	bool		ret;
 	char		*default_path;
+	my_bool         old_safe_mutex_deadlock_detector;
 
 	DBUG_ENTER("innobase_init");
         handlerton *innobase_hton= (handlerton *)p;
@@ -1660,13 +1661,13 @@ innobase_init(
 	srv_sizeof_trx_t_in_ha_innodb_cc = sizeof(trx_t);
 
 #ifdef SAFE_MUTEX
-        /* Disable deadlock detection as it's very slow for the buffer pool */
-        my_bool old_safe_mutex_deadlock_detector;
-        safe_mutex_deadlock_detector= 0;
+	/* Disable deadlock detection as it's very slow for the buffer pool */
+	old_safe_mutex_deadlock_detector= safe_mutex_deadlock_detector;
+	safe_mutex_deadlock_detector= 0;
 #endif
 	err = innobase_start_or_create_for_mysql();
 #ifdef SAFE_MUTEX
-        safe_mutex_deadlock_detector= old_safe_mutex_deadlock_detector;
+	safe_mutex_deadlock_detector= old_safe_mutex_deadlock_detector;
 #endif
 	if (err != DB_SUCCESS) {
 		my_free(internal_innobase_data_file_path,