From: sanja Date: April 15 2008 2:41pm Subject: bk commit into maria tree (bell:1.2632) BUG#22320 List-Archive: http://lists.mysql.com/maria/6 X-Bug: 22320 Message-Id: <20080415144153.1BFE78940ED@desktop.sanja.is.com.ua> 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 17:41:48+03:00, bell@stripped +1 -0 Bug#22320 workaround (second attempt) storage/maria/unittest/ma_pagecache_consist.c@stripped, 2008-04-15 17:41:46+03:00, bell@stripped +10 -0 Bug#22320 workaround (second attempt) 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-14 17:33:38 +03:00 +++ b/storage/maria/unittest/ma_pagecache_consist.c 2008-04-15 17:41:46 +03:00 @@ -470,8 +470,18 @@ 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"));