Skip to content

M
mariadb
Commit 831c8434 authored by Alexander Nozdrin's avatar Alexander Nozdrin
Browse files
Options

Fix manual-merge.

parent 966e0d9d
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 28 deletions
client/mysqltest.cc
View file @ 831c8434
...@@ -6933,9 +6933,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -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, ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7