diff options
| author | Frazer Clement <frazer@mysql.com> | 2009-10-08 16:36:36 +0100 |
|---|---|---|
| committer | Frazer Clement <frazer@mysql.com> | 2009-10-08 16:36:36 +0100 |
| commit | c7470df2feb72cbab98201b2e0a9ebec72a7fdd9 (patch) | |
| tree | 36cd457b45a072505bff483a2d8740c8d8ff1ea7 /client | |
| parent | 0d0f06da3a7ced9da59cca517a9ffead95c8f8d2 (diff) | |
| parent | fd04391340e9480857e0a31426cdefea21b5a036 (diff) | |
| download | mariadb-git-c7470df2feb72cbab98201b2e0a9ebec72a7fdd9.tar.gz | |
Merge 5.0-bugteam-> 5.1-bugteam
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 04a7e7b0c6f..e37b7d89a93 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6775,8 +6775,10 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, MYSQL_STMT *stmt; DYNAMIC_STRING ds_prepare_warnings; DYNAMIC_STRING ds_execute_warnings; + ulonglong affected_rows; DBUG_ENTER("run_query_stmt"); DBUG_PRINT("query", ("'%-.60s'", query)); + LINT_INIT(affected_rows); /* Init a new stmt if it's not already one created for this connection @@ -6911,9 +6913,6 @@ 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); |