mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
mysqltest.c:
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings client/mysqltest.c: To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
This commit is contained in:
parent
8fd8d819d0
commit
94f3584bc7
1 changed files with 10 additions and 1 deletions
|
@ -2597,6 +2597,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
|
|||
|
||||
if (!disable_result_log)
|
||||
{
|
||||
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
|
||||
|
||||
if (res)
|
||||
{
|
||||
MYSQL_FIELD *field= mysql_fetch_fields(res);
|
||||
|
@ -2619,6 +2621,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
|
|||
append_result(ds, res);
|
||||
}
|
||||
|
||||
/*
|
||||
Need to call mysql_affected_rows() before the new
|
||||
query to find the warnings
|
||||
*/
|
||||
if (!disable_info)
|
||||
affected_rows= (ulong)mysql_affected_rows(mysql);
|
||||
|
||||
/* Add all warnings to the result */
|
||||
if (!disable_warnings && mysql_warning_count(mysql))
|
||||
{
|
||||
|
@ -2641,7 +2650,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
|
|||
if (!disable_info)
|
||||
{
|
||||
char buf[40];
|
||||
sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql));
|
||||
sprintf(buf,"affected rows: %lu\n", affected_rows);
|
||||
dynstr_append(ds, buf);
|
||||
if (mysql_info(mysql))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue