List:Commits« Previous MessageNext Message »
From:tomas Date:June 29 2006 8:11pm
Subject:bk commit into 5.0 tree (tomas:1.2203)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2203 06/06/29 22:11:29 tomas@stripped +1 -0
  corrected merge error

  sql/ha_ndbcluster.cc
    1.265 06/06/29 22:11:22 tomas@stripped +3 -0
    corrected merge error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0

--- 1.264/sql/ha_ndbcluster.cc	2006-06-29 21:05:39 +02:00
+++ 1.265/sql/ha_ndbcluster.cc	2006-06-29 22:11:22 +02:00
@@ -5846,8 +5846,11 @@
   {
     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;
Thread
bk commit into 5.0 tree (tomas:1.2203)tomas29 Jun