From: Mikael Ronstrom
Date: May 19 2011 9:48am
Subject: bzr commit into mysql-trunk branch (mikael.ronstrom:3372)
List-Archive: http://lists.mysql.com/commits/137673
Message-Id: <201105190949.p4J9n7CV021867@dator6>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5754114679746158784=="

--===============5754114679746158784==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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.


--===============5754114679746158784==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mikael.ronstrom@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mikael.ronstrom@stripped\
#   85snc16nrtfnyhk4
# target_branch: file:///home/mikael/mysql_clones/mysql-trunk-\
#   wl5136_community/
# testament_sha1: 7f94f4995da5be7db5a5aac181a586d7e219c5bb
# timestamp: 2011-05-19 11:48:07 +0200
# source_branch: file:///home/mikael/mysql_clones/mysql-5.5-\
#   wl5136_community/
# base_revision_id: mikael.ronstrom@stripped\
#   r18lbm1a5qebgiff
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTghy5UAAijfgEAQUHf/919G
PCC/7//6UATe5toUF3OSAOjhJRNUfqJ6noj9U8nqh5MU2U0eo000AADQSqnqaaZGI0BiMQ0yGgA0
NG0gBKagKaT1PFH6ptTQ0AaBpoBoaNADmATTAJkMAATBMAAAEkgjTIAIAjSNMkyNqaDQNGj1LT12
OJN/0jloZETOBX/JbKE3amW1SStGdXHcQwrD+B57Bh2juLhCSUNGqEha1kWeWWxHmnGadBi0/vq3
CXUPkRBM2YPx5gEaohMsyXUvxiH4iKzhmBuYGiJjlJMJCJcZyQ+D3GGUIEELQBAmdWG68yXT++85
U4TFqJdSoF7jY3mJcNdIpERyzdic2aoTDQaMjO54zLOh2wOmOG6yYM8ItBZUditBygeECkU5IbQ7
vKBCtCcUKK4rlXiElGoypeqJqHeFa/Fc7vr2PTcVkwgBChYdAiBtAtPBNibO8D2YcOOU+O8glBkK
6IU4lw80OPAPDHWpFxkXhZoG8nsTurdrRjpUVQWBMcoEQ3Pi4m75DjIuMDiitZFQ4TM+V5aQKV1s
/HMC/Jt1ErVRnObHH7BsSoVXLpoDgLaRLTOqx8CJIus8QZPWvACmvGVNHuHlxFMBhdC1rwcYtwXI
u3zgUiQyyChpUUH35l4EaGHTYeWQSLLbQ0qgiaYcFpLJy6Aa1lkgk+czU95aRWw6QGd0iQVgMBEq
JvAvIYFVmxteGtk5OLHWUhde0bXg9NB4NU0VgYjNTOVrMtDCUHCOYW/znHAQNGoTJLykGgK0NAeA
mBS2UAhIUgkEhfDAgGS6ioQ9dSoKDCKWwcKyR+ctbUrHF7dtpzvNmsSbrQpYORgg1UE7mYbyWldU
TJq7OE/SBGwGqo2MV/WKkTycCBw6z7uwV/MXzl4DFQT6PxHOEqxLDKo9Ri4rBx7Qz7ZYqqoIgzkV
JQvyzMMDquorFnuIDAHPI/Ci8dScZ/d1ZJpMpLiLmNmMaM1FBFhauC2uBild3zMusLgsrQt/G9kf
lpPoPAvOhbUwMlVI9gc11cgxj0QcjyCGYabzI7hxZrwFaLsH2LT0LwMHLxoDOPoYC6LEPIwJ2YA2
wnpFO4C8HlmZh5hhzRyHV+Q9N6cgVhiLmFZurD5Iwevy46Q1RI4HejlsMB6ZPP+ke3moN8QOyFyQ
x8A683OALZom8gMRXwPgpFBJgyx09IBIp2oyFJdg8x6F2Xie9ma452jKBBMO6cpFcE9t9gWKphlc
N3G8CzMiFSKqnYRR5gRSUCpMyZgZe1BxKeI3eDcRJgTFSNmPWAlLwPUSZDl5OV2e7TcwwOXmRkEt
a67j5LqHD2HEpexwemHJB3QSn2tVR07Ek8MdRN3g0n5QIykmeOLYdJW1qqKMImFdAL6gmxRCc7Qz
nEYahqXkYiie4HEJvui4Lx+gWcgLHpE84XnUYuRaDIV7ReFitNA04r7i/nZOa2REGeTSerbC8+Jf
8SxBRfeXm14DGBrYmJdAP4u5IpwoSBwQ5cqA


--===============5754114679746158784==--