From d6fe37ae70a483aad8488509650f92411204606c Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Thu, 29 Jun 2006 22:11:29 +0200
Subject: [PATCH] corrected merge error

---
 sql/ha_ndbcluster.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 7f433f06cf9..e4ff39797ca 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -5846,8 +5846,11 @@ ndb_get_table_statistics(Ndb* ndb, const char * table,
   {
     Uint64 rows, commits, mem;
     Uint32 size;
+    Uint32 count= 0;
     Uint64 sum_rows= 0;
     Uint64 sum_commits= 0;
+    Uint64 sum_row_size= 0;
+    Uint64 sum_mem= 0;
     NdbScanOperation*pOp;
     NdbResultSet *rs;
     int check;