mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source 
client/mysqltest.c:
  SCCS merged
This commit is contained in:
unknown 2005-05-16 01:25:14 +02:00
commit 7f7da689b3
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/mysqltest.c
View file

@ -2729,6 +2729,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if (!disable_result_log) if (!disable_result_log)
{ {
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
if (res) if (res)
{ {
MYSQL_FIELD *field= mysql_fetch_fields(res); MYSQL_FIELD *field= mysql_fetch_fields(res);
@ -2750,6 +2752,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
append_result(ds, res); 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. We can't do this if we are in Add all warnings to the result. We can't do this if we are in
the middle of processing results from multi-statement, because the middle of processing results from multi-statement, because
@ -2777,7 +2786,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if (!disable_info) if (!disable_info)
{ {
char buf[40]; 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); dynstr_append(ds, buf);
if (mysql_info(mysql)) if (mysql_info(mysql))
{ {