bk commit into maria tree (bell:1.2633) BUG#22320

[sanja]

Below is the list of changes that have just been committed into a local
maria repository of bell.  When bell does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-15 22:42:50+03:00, bell@stripped +2 -0
  possible BUG#22320 removed because it does not help.

  storage/maria/unittest/ma_pagecache_consist.c@stripped, 2008-04-15 22:42:48+03:00, bell@stripped +0 -16
    possible BUG#22320 removed because it does not help.

  storage/maria/unittest/ma_pagecache_rwconsist.c@stripped, 2008-04-15 22:42:48+03:00, bell@stripped +0 -5
    possible BUG#22320 removed because it does not help.

diff -Nrup a/storage/maria/unittest/ma_pagecache_consist.c b/storage/maria/unittest/ma_pagecache_consist.c
--- a/storage/maria/unittest/ma_pagecache_consist.c	2008-04-15 17:41:46 +03:00
+++ b/storage/maria/unittest/ma_pagecache_consist.c	2008-04-15 22:42:48 +03:00
@@ -470,18 +470,8 @@ int main(int argc __attribute__((unused)
   pthread_mutex_lock(&LOCK_thread_count);
   while (thread_count)
   {
-    /*
-      workaround until we know why it crashes randomly on some machine
-      (BUG#22320).
-    */
-    sleep(1);
     if ((error= pthread_cond_wait(&COND_thread_count,&LOCK_thread_count)))
       diag("COND_thread_count: %d from pthread_cond_wait\n",error);
-    /*
-      workaround until we know why it crashes randomly on some machine
-      (BUG#22320).
-    */
-    sleep(1);
   }
   pthread_mutex_unlock(&LOCK_thread_count);
   DBUG_PRINT("info", ("thread ended"));
@@ -496,12 +486,6 @@ int main(int argc __attribute__((unused)
     exit(1);
   }
   my_delete(file1_name, MYF(0));
-
-  /*
-    workaround until we know why it crashes randomly on some machine
-    (BUG#22320).
-  */
-  sleep(2);
 
   DBUG_PRINT("info", ("file1 (%d) closed", file1.file));
   DBUG_PRINT("info", ("Program end"));
diff -Nrup a/storage/maria/unittest/ma_pagecache_rwconsist.c b/storage/maria/unittest/ma_pagecache_rwconsist.c
--- a/storage/maria/unittest/ma_pagecache_rwconsist.c	2008-04-14 17:33:38 +03:00
+++ b/storage/maria/unittest/ma_pagecache_rwconsist.c	2008-04-15 22:42:48 +03:00
@@ -354,11 +354,6 @@ int main(int argc __attribute__((unused)
 
   DBUG_PRINT("info", ("file1 (%d) closed", file1.file));
   DBUG_PRINT("info", ("Program end"));
-  /*
-    workaround until we know why it crashes randomly on some machine
-    (BUG#22320).
-  */
-  sleep(2);
   } /* SKIP_BIG_TESTS */
   my_end(0);