bk commit into 5.1 tree (tomas:1.2112)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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.2112 07/02/14 13:20:25 tomas@stripped +2 -0
  cluster_change_hist.txt
      cluster change history
  configure.in
      version drop6p6

  configure.in
    1.332 07/02/14 13:20:19 tomas@stripped +2 -2
    version drop6p6

  cluster_change_hist.txt
    1.21 07/02/14 13:20:19 tomas@stripped +7 -1
    cluster change history

# 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.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0-drop6

--- 1.331/configure.in	2007-02-14 13:12:32 +07:00
+++ 1.332/configure.in	2007-02-14 13:20:19 +07:00
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.2.0-a_drop6p5)
+AM_INIT_AUTOMAKE(mysql, 5.2.0-a_drop6p6)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=15:0:0
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=2
 NDB_VERSION_BUILD=0
-NDB_VERSION_STATUS="a_drop6p5"
+NDB_VERSION_STATUS="a_drop6p6"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.20/cluster_change_hist.txt	2007-02-14 13:12:32 +07:00
+++ 1.21/cluster_change_hist.txt	2007-02-14 13:20:19 +07:00
@@ -10,10 +10,16 @@ can be found on the MySQL website http:/
 (* == Alcatel has hit this bug)
 
 
-Alcatel Drop 6p5 (not released yet)
+Alcatel Drop 6p6 (not released yet)
 
 merge with drop5p19 containing the following bug fixes:
     *?Bug #26293 - cluster mgmt node sometimes doesn't receive events from all nodes on restart
+
+-------------------------------
+
+Alcatel Drop 6p5 (Tue 7 Feb 2007)
+
+      Bug #26267 - using node ids > 48 causes invalid memory access
 
 -------------------------------