Skip to content

M
mariadb
Commit 516b39c6 authored by Alexander Nozdrin's avatar Alexander Nozdrin
Browse files
Options

Fix manual-merge (2nd attempt).

parent 6a795bf3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
client/mysqltest.cc
View file @ 516b39c6
...@@ -6795,10 +6795,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -6795,10 +6795,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
DYNAMIC_STRING ds_prepare_warnings; DYNAMIC_STRING ds_prepare_warnings;
DYNAMIC_STRING ds_execute_warnings; DYNAMIC_STRING ds_execute_warnings;
ulonglong affected_rows;
DBUG_ENTER("run_query_stmt"); DBUG_ENTER("run_query_stmt");
DBUG_PRINT("query", ("'%-.60s'", query)); DBUG_PRINT("query", ("'%-.60s'", query));
LINT_INIT(affected_rows);
/* /*
Init a new stmt if it's not already one created for this connection Init a new stmt if it's not already one created for this connection
......
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