From: Tor Didriksen
Date: February 7 2011 1:04pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3603 to 3604) Bug#59632
List-Archive: http://lists.mysql.com/commits/130569
X-Bug: 59632
Message-Id: <20110207130400.EA579376D@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 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
 3603 Jon Olav Hauglid	2011-02-07
      Bug #59861 why does log_slow_statement call thd_proc_info twice?
      
      This patch removes an extraneous
        thd_proc_info(thd, "logging slow query")
      call from low_slow_statement(). The removed call was from
      before it was decided to actually log the query to the slow log.
      
      No test case added.

    modified:
      sql/sql_parse.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();
   }
 

No bundle (reason: useless for push emails).