From: Tor Didriksen
Date: July 30 2010 9:42am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3329 to 3330)
List-Archive: http://lists.mysql.com/commits/114714
Message-Id: <20100730094216.5A26F3723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5034607091604042671=="

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

 3330 Tor Didriksen	2010-07-30
      Post push fix: 'gmake -j 4' revealed a lacking dependency on GenError.

    modified:
      sql/CMakeLists.txt
 3329 Tor Didriksen	2010-07-30
      Bug #54805 definitions in regex/my_regex.h conflict with /usr/include/regex.h
      
      Pos-push fix: header guard in my_regex.h conflicts with /usr/include/regex.h
      
      Also: Implement mock functions for new interactions between MDL and THD.
      Also: Don't gunit tests with sql library, link with a minimal library instead.
     @ regex/my_regex.h
        Fix include guard.
     @ sql/CMakeLists.txt
        New, minimal, library for gunit tests.
     @ unittest/gunit/CMakeLists.txt
        Do not link with sql library.
     @ unittest/gunit/mdl-t.cc
        New mock functions for MDL/THD interaction.
     @ unittest/gunit/mdl_mytap-t.cc
        New mock functions for MDL/THD interaction.

    modified:
      regex/my_regex.h
      sql/CMakeLists.txt
      unittest/gunit/CMakeLists.txt
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-30 08:34:23 +0000
+++ b/sql/CMakeLists.txt	2010-07-30 09:39:00 +0000
@@ -104,6 +104,7 @@ SET (SLAVE_SOURCE rpl_slave.cc rpl_repor
 ADD_LIBRARY(slave ${SLAVE_SOURCE})
 ADD_DEPENDENCIES(slave GenError)
 ADD_LIBRARY(sqlgunitlib mdl.cc sql_list.cc sql_string.cc thr_malloc.cc)
+ADD_DEPENDENCIES(sqlgunitlib GenError)
 
 
 IF(WIN32)


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   1m9bixu37jjfpss5
# target_branch: file:///export/home/didrik/repo/next-mr-bf-bug54805-\
#   pp/
# testament_sha1: 109ff1d503607b36d2c6fcc689df0218b3340e3d
# timestamp: 2010-07-30 11:42:16 +0200
# base_revision_id: tor.didriksen@stripped\
#   s7e0vl1fjp15sh2i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWf4xq8AAXBfgAAQUOP/936n
TAC////wUAOa3u2TcV1VuYhKJT0ajTQMgmankTaeUQ0YmQeo0aCSVGanpk0U9pT1PRGgNAaAA0AB
KIGkmaEm1NB6mmgAGhoADQcwAEwABMAAAAABJIk2gU8yJhKfpNqT1D1A0A0DamhXnZfS82be1lSD
OqAuiOzDnYZ5d1/bnVVPXWn1BlLMi+bWNdZxZy53+nv3RdJrUjMNTAxRNmwZ7jxiid2k9rz7Ykh8
iNlOxWmLoNhZ0hPCEjFIyJHyoPi91AtLxZL9Quc3CO60Q9Ifjg1TyoZkinYcD2E8HLheQGL3yjML
UiqYxEON6U3TJwNePg07qWUcmo+ZqGUic+ic9NJCNbaoRvYkGsUGGYRPVmCw21DG3dLp56AolA5B
d4kAcImGTBB51FbYKrE44VT0Nc/Ssi2iwDg81e+RdrOYkSx1W7f3G9h7NVPAbHpoahqU5OLQjobO
MNKZfhIrkypQ6BxDpxs3CcuDW4RvLNdlrM91yvtwBqh9oqoUWjRHCoU8csSuqTPKIpPMwkcrDFOY
R2yltRUouFLFjc4ZnorLEgEmVkOwnhOSTkFf6zNRC45VFVeljubOvxfts/FsukR9RrdTYqumicoa
t7S5jyqNDMeNGlRgpT2dw170QcVYcLQp6qN3Y8cb5UHJB0+zKPNqwW/mJV4PquiZxjYByo9M00qq
CMeKIVRtJ6RivHTXCM0kiwS7vfyNhaiGJNBFNWutBI74R5ythO3FxYZ9UTtaslltg/+g2rV30MxV
syyyGii7ex+mJzkC/hKqR6yxMpjTOiEuZwO0pRfQptcyyTzJmIyFJgMP5RWXg8MVofYItY3bBDSW
YNOSnYoKoV6HQvXFP7aWu2+i+GyQ/kFLyAKKeZ4B2N11lNeGA2B+zFqu9rEdFNSJuEjDsaCkkU8z
QDYDwT7qDAIhF4cJ6Ehiu8p80CbLnV7BHQTc7DZUcbTHOfLKQ2M7mBUEXMz4AsGeSgXUqehFUVK7
IYFoKTg6qT+Y20j+SGCC15FsnLiCxSvZlQcxVc/dy4YZn2CheckiqOLVMCkmSWmhFUdOQdw84J6r
6NymWc+5TQE6iLeDnTZArseYQeWYg1KjSfbxaj3SFuuasK02UeqxZ7nD2tyPV8YV51FbBIkM7v7A
tBlByhgeCiLO8m48uleTp/OWJweAaGx7yL1uBwu+/2ucMaLSkd/i7kinChIM/xjV4A==


--===============5034607091604042671==--