bzr push into mysql-5.1 branch (tor.didriksen:3852 to 3853) Bug#14840488

[Tor Didriksen]

 3853 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.

    modified:
      libmysql/libmysql.c
      tests/mysql_client_test.c
 3852 Anirudh Mangipudi	2012-10-30
      BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE 
                    TO 'MYISAM_SORT_BUFFER_SIZE'
      Problem: 'myisam_sort_buffer_size' is a parameter used by 
      mysqld program only whereas 'sort_buffer_size' is used by
      mysqld and myisamchk programs. But the error message printed
      when myisamchk program is run with insufficient buffer size 
      is myisam_sort_buffer_size is too small which may mislead to the
      server parameter myisam_sort_buffer_size.
      SOLUTION: A parameter 'myisam_sort_buffer_size' is added as an
      alias for 'sort_buffer_size' and the 'sort_buffer_size' parameter
      is marked as deprecated. So myisamchk also has both the parameters
      with the same role.

    modified:
      storage/myisam/myisamchk.c
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2012-06-28 15:38:55 +0000
+++ b/libmysql/libmysql.c	2012-11-01 16:23:06 +0000
@@ -4653,7 +4653,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQ
   if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
   {
     set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
-    return 1;
+    DBUG_RETURN(1);
   }
   if (column >= stmt->field_count)
   {

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2012-07-09 13:10:07 +0000
+++ b/tests/mysql_client_test.c	2012-11-01 16:23:06 +0000
@@ -15278,6 +15278,7 @@ static void test_bug27876()
 
   rc= mysql_query(mysql, "set names default");
   myquery(rc);
+  DBUG_VOID_RETURN;
 }
 
 

No bundle (reason: useless for push emails).