From 516b39c68305afc720d26ab5011ec5c30f9dcbe8 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Tue, 10 Nov 2009 00:08:17 +0300
Subject: [PATCH] Fix manual-merge (2nd attempt).

---
 client/mysqltest.cc | 2 --
 1 file changed, 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