merge 5.1 => 5.5

c8ab8493 · Tor Didriksen · 02501a0f · 86c0a80b · c8ab8493 · c8ab8493
Commit c8ab8493 authored Nov 01, 2012 by Tor Didriksen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

libmysql/libmysql.c libmysql/libmysql.c +1 -1

tests/mysql_client_test.c tests/mysql_client_test.c +1 -0

No files found.
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4218,7 +4218,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind,
  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)
  {

--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15887,6 +15887,7 @@ static void test_bug27876()
  rc= mysql_query(mysql, "set names default");
  myquery(rc);
+  DBUG_VOID_RETURN;
 }