diff options
| author | msvensson@neptunus.(none) <> | 2006-12-08 16:43:50 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-08 16:43:50 +0100 |
| commit | 9064723d1b64e7ad806864831722783a8e3f7b8d (patch) | |
| tree | 01af109d69c100af90d58ca893abf431f9f2255f /client | |
| parent | 40927c0cb2a84743957f431f28e4d1b0f4dd6d51 (diff) | |
| download | mariadb-git-9064723d1b64e7ad806864831722783a8e3f7b8d.tar.gz | |
Bug#19410 Test 'kill' fails on Windows + SCO
- Use "mysql_field_count" to determine if there is a need to
call "mysql_store_result"
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index ac186a7361e..3d9344fb098 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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) |