corrected merge error

5d67b052 · tomas@poseidon.ndb.mysql.com · 6f318d16 · 5d67b052
Commit 5d67b052 authored Jun 29, 2006 by tomas@poseidon.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +3 -0

No files found.
--- 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;