1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix manual-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-11-09 18:13:11 +03:00
parent e89a561d52
commit 72362ac7fa
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysqltest.cc
View File

@ -6933,9 +6933,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
Fetch info before fetching warnings, since it will be reset Fetch info before fetching warnings, since it will be reset
otherwise. otherwise.
*/ */
{
ulonglong affected_rows;
LINT_INIT(affected_rows);
if (!disable_info) if (!disable_info)
append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql)); append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql));
@ -6962,10 +6959,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
ds_execute_warnings.length); ds_execute_warnings.length);
} }
} }
if (!disable_info)
append_info(ds, affected_rows, mysql_info(mysql));
}
} }
end: end: