From: Tor Didriksen
Date: November 1 2012 11:50am
Subject: bzr push into mysql-trunk branch (tor.didriksen:4878 to 4879)
List-Archive: http://lists.mysql.com/commits/145191
Message-Id: <20121101115056.6646.53650.4879@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4879 Tor Didriksen	2012-11-01 [merge]
      merge 5.6 => trunk

    modified:
      sql/mysqld.cc
 4878 Tor Didriksen	2012-11-01 [merge]
      merge 5.6 => trunk

    modified:
      libmysql/libmysql.c
      tests/mysql_client_test.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-10-25 13:34:04 +0000
+++ b/sql/mysqld.cc	2012-11-01 11:49:52 +0000
@@ -3260,9 +3260,9 @@ check_enough_stack_size()
 {
   uchar stack_top;
 
-  if (current_thd != 0)
-    return check_stack_overrun(current_thd, STACK_MIN_SIZE,
-                             &stack_top);
+  THD *my_thd= current_thd;
+  if (my_thd != NULL)
+    return check_stack_overrun(my_thd, STACK_MIN_SIZE, &stack_top);
   return 0;
 }
 #endif

No bundle (reason: useless for push emails).