From: Tor Didriksen
Date: February 7 2011 1:03pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3604) Bug#59632
List-Archive: http://lists.mysql.com/commits/130568
X-Bug: 59632
Message-Id: <20110207130351.C091D376D@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9173498657574752801=="

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

#At file:///export/home/didrik/repo/trunk/ based on revid:jon.hauglid@stripped

 3604 Tor Didriksen	2011-02-07
      Bug #59632, post-push fix for unit test.
      
      thd->thread_stack must point to the stack, not free-store.
      
      Also: add an extra 'mysys' to the link command for SERVER_TESTS.
            (it failed to link on debian)

    modified:
      unittest/gunit/CMakeLists.txt
      unittest/gunit/item-t.cc
=== modified file 'unittest/gunit/CMakeLists.txt'
--- a/unittest/gunit/CMakeLists.txt	2011-02-01 07:52:46 +0000
+++ b/unittest/gunit/CMakeLists.txt	2011-02-07 13:03:47 +0000
@@ -239,7 +239,7 @@ FOREACH(test ${SERVER_TESTS})
     ADD_EXECUTABLE(${test}-t ${test}-t.cc)
   ENDIF()
   TARGET_LINK_LIBRARIES(${test}-t sql binlog rpl master slave sql)
-  TARGET_LINK_LIBRARIES(${test}-t gunit sqlgunitlib strings dbug regex)
+  TARGET_LINK_LIBRARIES(${test}-t gunit sqlgunitlib strings dbug regex mysys)
   IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
     SET_TARGET_PROPERTIES(${test}-t  PROPERTIES LINK_FLAGS "-library=stlport4")
   ENDIF()

=== modified file 'unittest/gunit/item-t.cc'
--- a/unittest/gunit/item-t.cc	2011-02-07 10:18:21 +0000
+++ b/unittest/gunit/item-t.cc	2011-02-07 13:03:47 +0000
@@ -53,7 +53,8 @@ protected:
   virtual void SetUp()
   {
     m_thd= new THD(false);
-    m_thd->thread_stack= (char*) &m_thd;
+    THD *stack_thd= m_thd;
+    m_thd->thread_stack= (char*) &stack_thd;
     m_thd->store_globals();
   }
 


--===============9173498657574752801==
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\
#   lmjksir7xpbf3sth
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: a2f2e3f2d83f5f785978dbae29b86f7b7b0a39ca
# timestamp: 2011-02-07 14:03:51 +0100
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: jon.hauglid@stripped\
#   m0a336hi7wav0wmt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZrAI9MAAijfgFAQXff//37v
HQC////6UAT7rW89u73t3vDr3HO2cusJJERpinkxKfiEYpsmhB5R6ZT1PUNA9T1NqNAlIp6NT0wg
RpA0MmgAAAAAACUphqNARMZJ6agaABoAANAAAkUmTVPVPJtU/VN5MVH5KHoT9UABpk0AA0AJJJo0
aI0YSntNFHqPQj1HqbIgyDQAAXxyVaODTSq7P2ECy6WEbHhTNkmtcCMyCqxy3StbFeQGHTVzb9Wl
5znENNt/L3B94zG319sqCyTgSJ/Ys07s/spR4mkv1H9qOXVrWPEbzamkHWtRsPJjQlJt10MxYPxO
LKTLLSD2EWetrG8WO9/Rh9t+5b1XzlUzdYwYDkhH5TGMKFcBSmFupd/S5WvrhkajhEwohOlaYigb
QpXJIbtDh0CABEP2NIPSUHiAauGCj48CCta0OJApQ9aF95yUeap3amK0xWZwpZZiQIGZivnnN8nb
IhUImoKpfyV9BwiRKEkxyJA0wneUkCEVv2n6EAIFBcFOJQ1NalecODRcktW6u+RLRphvnYduKpxC
LSVRdeRBYPAZwMKlRMkyp4uxoxj3FDaPl6gKTk5SW14EV4Cq00KkvTUkiOaWDoDAVlxSW5hWsQZh
qSpxJUAw5STuHLKqyZ7SvpKiWK9FSNQOowV2q9ONM8hfi26ZycwuTVPaxnUFldFMpA1FTYByWzUD
wMMIXZBy0QmJyh4y+q8LI5AeELtP6xTgJZ6w14OrfhNlLi68zUZ7BxI+ewYWBLSgfXNHJISYpwYy
8WfmaCyCxVUsJL8ShfYjmBEriuBFM3NbNhzK3Kjv67VRBkHkPDpOXeSJJoOrq4ahmZmZuP4zS8aL
uvnFJ+pXftzc/4XvKLT5FCjmc0XhPBTNzid0Yxq2Rv3wBhMeRm1bzWaCIXcpDT3jeo0naecJ4HsN
9SL4l7iUytqIrLiLn9sNuIkkfdhsrmSenLYn9l24Rz7h5T6CAs2VyAXMZZtOnPm96W5V3zKSZj4r
N51Flv1jTmQHZ66BLbZZReeAvCJfzU0bMsQxgDpbaVMBEytgda+hIxqs4kSFwznUSlb3gGj82nbW
6CcgWLJ3HpGEGrXuQIIZCRTC6dmXHXFT5sdEcyofKxo5MoI5PBFBO2Usuzti3NF0Ebo543m9Xd0D
TN6F5qlmzcrF/DMpXJugHK38DiKxboLbOehx5EhtXscBPRUJa3amVoZr41ndqhss9aIr870iPWgm
TBYCuoLeRFdMTyebVdN3kWDAYnQj3RKLwx4M7nuiQLx4GVTbBmRocxgisF8gNYUopcdIx0kxESZD
8d61kCXVhz5QOE2RCigTuEc5XmWGYtqIZQIyGFSmxScmvQTmNHlGUJDka5FKIsrsRAdMJibBrIr2
rGnjaAUT4pg5THZEikf0SYTlFybbn6jDJpYYJtoD1NK9vHfDRq6rRxoYiYMzJGC8MwFj0gqkHcDB
S5ElkvI/NjBIUJUtls8zOIWlXSMC2ffBJc5iXiURMKE4CxxUozWPopW1iv33ZYBFCTZJMysuY9tl
47+yskHEjyXYTvJQlE8c0ysyf5gt5TpY3hKSdpkv6KComiTjWa0w7ZILAsDnQOUbwvblB0qzh2UL
R10MqqN2vrNpKULMtqIc3Wt63VkC+esqJwNyeLIuJnM5Coejf53+LuSKcKEhNYBHpg==


--===============9173498657574752801==--