bzr commit into mysql-6.0 branch (guilhem:2925)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria/ based on revid:guilhem@stripped

 2925 Guilhem Bichot	2008-12-04 [merge]
      Merge of 5.1-maria into 6.0-maria
modified:
  storage/innobase/handler/ha_innodb.cc

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2008-12-04 21:02:09 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2008-12-04 21:41:03 +0000
@@ -1441,7 +1441,7 @@ innobase_init(
 	int		err;
 	bool		ret;
 	char		*default_path;
-        my_bool old_safe_mutex_deadlock_detector;
+	my_bool         old_safe_mutex_deadlock_detector;
 
 	DBUG_ENTER("innobase_init");
         handlerton *innobase_hton= (handlerton *)p;
@@ -1690,13 +1690,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 */
-        old_safe_mutex_deadlock_detector= 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,