wt: comments, OOM checks, test case for deadlock detection

include/waiting_threads.h:
  make wt_thd_dontwait private
mysql-test/r/maria.result:
  deadlock example
mysql-test/t/maria.test:
  deadlock example
mysys/waiting_threads.c:
  comments, OOM checks
sql/mysqld.cc:
  fix variables
sql/sql_class.cc:
  move wt_lazy_init to THD constructor
sql/sql_class.h:
  move wt_lazy_init to THD constructor
storage/maria/ha_maria.cc:
  backport from 6.0
storage/maria/ma_write.c:
  poset-review fixes, set thd->proc_info
storage/maria/trnman.c:
  bugfixing
storage/myisam/mi_check.c:
  warnings
storage/myisam/mi_page.c:
  warnings
storage/myisam/mi_search.c:
  warnings
storage/myisammrg/myrg_create.c:
  warnings
unittest/mysys/waiting_threads-t.c:
  fixes

1 files changed, 6 insertions, 6 deletions

diff --git a/unittest/mysys/waiting_threads-t.c b/unittest/mysys/waiting_threads-t.c
index 48ea0b36df6..b14f31a0432 100644
--- a/unittest/mysys/waiting_threads-t.c
+++ b/unittest/mysys/waiting_threads-t.c
@@ -214,12 +214,9 @@ void do_tests()
     ok_wait(1,2,1);
     ok_deadlock(2,0,2);
 
-    // FIXME remove wt_thd_dontwait calls below
-    wt_thd_dontwait(& thds[0].thd);
-    wt_thd_dontwait(& thds[1].thd);
-    wt_thd_dontwait(& thds[2].thd);
-    wt_thd_dontwait(& thds[3].thd);
     pthread_mutex_lock(&lock);
+    wt_thd_cond_timedwait(& thds[0].thd, &lock);
+    wt_thd_cond_timedwait(& thds[1].thd, &lock);
     wt_thd_release_all(& thds[0].thd);
     wt_thd_release_all(& thds[1].thd);
     wt_thd_release_all(& thds[2].thd);
@@ -252,7 +249,10 @@ void do_tests()
   do_one_test();
 
   test_kill_strategy(LATEST);
-  test_kill_strategy(RANDOM);
+  SKIP_BIG_TESTS(1)
+  {
+    test_kill_strategy(RANDOM);
+  }
   test_kill_strategy(YOUNGEST);
   test_kill_strategy(LOCKS);