diff options
| author | Frazer Clement <frazer@mysql.com> | 2009-10-05 13:57:59 +0100 |
|---|---|---|
| committer | Frazer Clement <frazer@mysql.com> | 2009-10-05 13:57:59 +0100 |
| commit | de985fc732fb63791089f081fb8d10e57aafab5e (patch) | |
| tree | 36fc922266f413b0903cb2563356532602382c7c /client | |
| parent | 00968ae167d8d026d0e66587b5938920155930d2 (diff) | |
| parent | 379d1f19ce5d8e1143ac3d46b731fbab1f626272 (diff) | |
| download | mariadb-git-de985fc732fb63791089f081fb8d10e57aafab5e.tar.gz | |
Merge 5.0-bugteam->5.1 bugteam
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9e8f31178ad..04a7e7b0c6f 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6907,6 +6907,16 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, */ } + /* + Need to grab affected rows information before getting + warnings here + */ + ulonglong affected_rows; + LINT_INIT(affected_rows); + + if (!disable_info) + affected_rows= mysql_affected_rows(mysql); + if (!disable_warnings) { /* Get the warnings from execute */ @@ -6931,7 +6941,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, } if (!disable_info) - append_info(ds, mysql_affected_rows(mysql), mysql_info(mysql)); + append_info(ds, affected_rows, mysql_info(mysql)); } |