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

[Guilhem Bichot]

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

 2926 Guilhem Bichot	2008-12-05 [merge]
      merge of 5.1-maria into 6.0-maria
modified:
  mysql-test/suite/maria/t/maria_showlog_error.test
  storage/innobase/handler/ha_innodb.cc

=== modified file 'mysql-test/suite/maria/t/maria_showlog_error.test'
--- a/mysql-test/suite/maria/t/maria_showlog_error.test	2008-12-01 13:21:37 +0000
+++ b/mysql-test/suite/maria/t/maria_showlog_error.test	2008-12-05 09:15:23 +0000
@@ -1,4 +1,6 @@
 -- source include/have_maria.inc
+# can't restart server in embedded
+--source include/not_embedded.inc
 # remove_file can't remove opened file under windows. So we can't reproduce
 # the problem there
 --source include/not_windows.inc

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2008-12-04 21:41:03 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2008-12-05 09:18:03 +0000
@@ -1441,7 +1441,9 @@ innobase_init(
 	int		err;
 	bool		ret;
 	char		*default_path;
+#ifdef SAFE_MUTEX
 	my_bool         old_safe_mutex_deadlock_detector;
+#endif
 
 	DBUG_ENTER("innobase_init");
         handlerton *innobase_hton= (handlerton *)p;