Commit 9064723d authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files

Bug#19410 Test 'kill' fails on Windows + SCO 

 - Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"
parent 40927c0c

client/mysqltest.c

+5 −3
Original line number Diff line number Diff line
@@ -4680,10 +4680,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    /*

      Store the result. If res is NULL, use mysql_field_count to

      determine if that was expected

      Store the result of the query if it will return any fields

    */

    if (!(res= mysql_store_result(mysql)) && mysql_field_count(mysql))

    if (mysql_field_count(mysql) && ((res= mysql_store_result(mysql)) == 0))

    {

      handle_error(command, mysql_errno(mysql), mysql_error(mysql),

		   mysql_sqlstate(mysql), ds);
@@ -4735,7 +4734,10 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    if (res)

    {

      mysql_free_result(res);

      res= 0;

    }

    counter++;

  } while (!(err= mysql_next_result(mysql)));

  if (err > 0)