bzr push into mysql-5.6 branch (tor.didriksen:4523 to 4524) Bug#14303860

[Tor Didriksen]

 4524 Tor Didriksen	2012-11-01
      BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO MANY WILDCARDS CAUSES A SEGFAULT
      
      Post-push fix: current_thd is an expensive call, don't do it twice.

    modified:
      sql/mysqld.cc
 4523 Tor Didriksen	2012-11-01
      Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TEST
      
      Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up,
      and _db_enter_ and _db_exit_ will access data outside the current stack frame.
      
      Add some missing mysql_free_xx() mysql_close_xx() to fix memory leaks.

    modified:
      libmysql/libmysql.c
      tests/mysql_client_test.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-10-24 08:43:19 +0000
+++ b/sql/mysqld.cc	2012-11-01 11:45:07 +0000
@@ -3269,9 +3269,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).