maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2695 knielsen@xxxxxxxxxxxxxxx	2009-04-21
      Fix two missing DBUG_RETURN.
      modified:
        libmysql/libmysql.c
        tests/mysql_client_test.c

=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2008-12-10 09:02:25 +0000
+++ b/libmysql/libmysql.c	2009-04-21 10:24:51 +0000
@@ -4634,7 +4634,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	2009-02-19 09:01:25 +0000
+++ b/tests/mysql_client_test.c	2009-04-21 10:24:51 +0000
@@ -16295,6 +16295,8 @@ static void test_bug27876()
 
   rc= mysql_query(mysql, "set names default");
   myquery(rc);
+
+  DBUG_VOID_RETURN;
 }