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

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

    modified:
      libmysql/libmysql.c
      tests/mysql_client_test.c
 4877 Kristofer Pettersson	2012-11-01 [merge]
      merge 5.6=>trunk

=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2012-10-31 12:06:03 +0000
+++ b/libmysql/libmysql.c	2012-11-01 11:04:50 +0000
@@ -4239,7 +4239,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-10-31 12:06:03 +0000
+++ b/tests/mysql_client_test.c	2012-11-01 11:04:50 +0000
@@ -978,6 +978,7 @@ static void test_wl4435_2()
     rc= mysql_query(mysql, "DROP PROCEDURE p1");
     myquery(rc);
   }
+  mct_close_log();
 }
 
 
@@ -1041,6 +1042,7 @@ static void test_wl4435_2()
   rc= mysql_stmt_next_result(ps); \
   DIE_UNLESS(rc == 0); \
   \
+  mysql_free_result(rs_metadata); \
   mysql_stmt_free_result(ps); \
   mysql_stmt_close(ps); \
   \
@@ -16192,6 +16194,7 @@ static void test_bug27876()
 
   rc= mysql_query(mysql, "set names default");
   myquery(rc);
+  DBUG_VOID_RETURN;
 }
 
 
@@ -17981,6 +17984,8 @@ static void test_bug43560(void)
   rc= mysql_stmt_execute(stmt);
   DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST);
 
+  mysql_stmt_close(stmt);
+
   opt_drop_db= 0;
   client_disconnect(conn);
   rc= mysql_query(mysql, "DROP TABLE t1");
@@ -18280,6 +18285,7 @@ static void test_bug42373()
   DIE_UNLESS(rc == 1);
 
   mysql_stmt_close(stmt);
+  mysql_close(&con);
 
   /* Now try with a multi-statement. */
   DIE_UNLESS(mysql_client_init(&con));

No bundle (reason: useless for push emails).