bk commit into 5.0 tree (tomas:1.2200) BUG#19852

[tomas]

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.2200 06/06/27 11:26:00 tomas@stripped +3 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - correction of previous patch

  sql/ha_ndbcluster.cc
    1.263 06/06/27 11:25:54 tomas@stripped +0 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.20 06/06/27 11:25:54 tomas@stripped +1 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/GlobalSignalNumbers.h
    1.12 06/06/27 11:25:54 tomas@stripped +2 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

# 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-main

--- 1.11/ndb/include/kernel/GlobalSignalNumbers.h	2006-06-27 10:02:24 +02:00
+++ 1.12/ndb/include/kernel/GlobalSignalNumbers.h	2006-06-27 11:25:54 +02:00
@@ -680,7 +680,7 @@
 #define GSN_BACKUP_FRAGMENT_REF         546
 #define GSN_BACKUP_FRAGMENT_CONF        547
 
-#define GSN_BACKUP_FRAGMENT_COMPLETE_REP 502
+#define GSN_BACKUP_FRAGMENT_COMPLETE_REP 575
 
 #define GSN_STOP_BACKUP_REQ             548
 #define GSN_STOP_BACKUP_REF             549
@@ -731,7 +731,7 @@
 #define GSN_SUB_STOP_REQ                572
 #define GSN_SUB_STOP_REF                573
 #define GSN_SUB_STOP_CONF               574
-/*                                      575 unused */
+/*                                      575 used */
 #define GSN_SUB_CREATE_REQ              576
 #define GSN_SUB_CREATE_REF              577
 #define GSN_SUB_CREATE_CONF             578

--- 1.19/ndb/include/kernel/signaldata/DictTabInfo.hpp	2006-06-27 10:02:24 +02:00
+++ 1.20/ndb/include/kernel/signaldata/DictTabInfo.hpp	2006-06-27 11:25:54 +02:00
@@ -124,7 +124,7 @@
 
     MaxRowsLow         = 139,
     MaxRowsHigh        = 140,
-    MinRowsLow         = 133,
+    MinRowsLow         = 143,
     MinRowsHigh        = 144,
 
     TableEnd           = 999,

--- 1.262/sql/ha_ndbcluster.cc	2006-06-27 10:02:33 +02:00
+++ 1.263/sql/ha_ndbcluster.cc	2006-06-27 11:25:54 +02:00
@@ -4158,7 +4158,6 @@
   }
   tab.setMaxRows(max_rows);
   tab.setMinRows(min_rows);
-  fprintf(stderr, "max/min %llu %llu\n", max_rows, min_rows);
 }
 
 int ha_ndbcluster::create(const char *name,