bzr commit into mysql-trunk branch (mikael.ronstrom:3372)

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/mysql-trunk-wl5136_community/ based on revid:mikael.ronstrom@stripped

 3372 Mikael Ronstrom	2011-05-19
      Fixed problem with unittests for new thd_wait interface

    modified:
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
=== modified file 'unittest/gunit/mdl-t.cc'
--- a/unittest/gunit/mdl-t.cc	revid:mikael.ronstrom@stripped
+++ b/unittest/gunit/mdl-t.cc	revid:mikael.ronstrom@stripped
@@ -40,6 +40,18 @@ mysql_mutex_t LOCK_open;
 uint    opt_debug_sync_timeout= 0;
 
 /*
+  Mock thd_wait_begin/end functions
+*/
+
+extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
+{
+}
+
+extern "C" void thd_wait_end(MYSQL_THD thd)
+{
+}
+
+/*
   A mock error handler.
 */
 static uint expected_error= 0;

=== modified file 'unittest/gunit/mdl_mytap-t.cc'
--- a/unittest/gunit/mdl_mytap-t.cc	revid:mikael.ronstrom@stripped
+++ b/unittest/gunit/mdl_mytap-t.cc	revid:mikael.ronstrom@stripped
@@ -93,6 +93,17 @@ do { \
   EXPECT_TRUE(1 == 0)
 
 
+/*
+  Mock thd_wait_begin/end functions
+*/
+
+extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
+{
+}
+
+extern "C" void thd_wait_end(MYSQL_THD thd)
+{
+}
 
 /*
   A mock error handler.


Attachment: [text/bzr-bundle] bzr/[e-mail]