summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-10 00:08:17 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-10 00:08:17 +0300
commit516b39c68305afc720d26ab5011ec5c30f9dcbe8 (patch)
treed23ba7998be67c842707aa056b8e3ac9dbe5ed04 /client
parent6a795bf3b93a0e0948ff65d0df01d008a59a8e30 (diff)
downloadmariadb-git-516b39c68305afc720d26ab5011ec5c30f9dcbe8.tar.gz
Fix manual-merge (2nd attempt).
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 85adb445185..1acf4da8d53 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -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