bzr commit into mysql-6.0-runtime branch (guilhem:2777) Bug#41399

[Guilhem Bichot]

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

 2777 Guilhem Bichot	2008-12-12
      Two small fixes: 1) when server is shutting down, one can get errno 2013 so expect it in tests (actually,
      I'm taking what's already in wait_until_connected_again.inc)
      2) fix for BUG#41399 "Maria: mutex deadlock detection warning LOCK_audit_mask LOCK_plugin": this is a safe case
      where table lock serializes problematic cases, so we silence the detector here.
modified:
  mysql-test/include/wait_until_disconnected.inc
  sql/sql_audit.cc

=== modified file 'mysql-test/include/wait_until_disconnected.inc'
--- a/mysql-test/include/wait_until_disconnected.inc	2008-12-05 14:08:09 +0000
+++ b/mysql-test/include/wait_until_disconnected.inc	2008-12-12 15:05:35 +0000
@@ -10,7 +10,7 @@ let $counter= 5000;
 let $mysql_errno= 0;
 while (!$mysql_errno)
 {
-  --error 0,2002,2003,2006,1053
+  --error 0,1040,1053,2002,2003,2006,2013
   show status;
 
   dec $counter;

=== modified file 'sql/sql_audit.cc'
--- a/sql/sql_audit.cc	2008-03-26 14:30:28 +0000
+++ b/sql/sql_audit.cc	2008-12-12 15:05:35 +0000
@@ -343,7 +343,12 @@ int finalize_audit_plugin(st_plugin_int 
   bzero(&event_class_mask, sizeof(event_class_mask));
 
   /* Iterate through all the installed plugins to create new mask */
-  pthread_mutex_lock(&LOCK_audit_mask);
+
+  /*
+    LOCK_audit_mask/LOCK_plugin order is not fixed, but serialized with table
+    lock on mysql.plugin.
+  */
+  my_pthread_mutex_lock(&LOCK_audit_mask, MYF_NO_DEADLOCK_DETECTION);
   plugin_foreach(current_thd, calc_class_mask, MYSQL_AUDIT_PLUGIN,
                  &event_class_mask);