Fix manual-merge (2nd attempt).

This commit is contained in:
Alexander Nozdrin 2009-11-10 00:08:17 +03:00
parent 6a795bf3b9
commit 516b39c683

View File

@ -6795,10 +6795,8 @@ 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