bk commit into 5.1 tree (tomas:1.2454)

[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.2454 07/03/09 10:27:53 tomas@stripped +4 -0
      change hist
      bump up version
      not compatible with earlier version

  storage/ndb/src/common/util/version.c
    1.29 07/03/09 10:27:44 tomas@stripped +3 -1
    not compatible with earlier version

  configure.in
    1.427 07/03/09 10:27:44 tomas@stripped +2 -2
    bump up version

  BitKeeper/etc/ignore
    1.272 07/03/09 10:27:44 tomas@stripped +1 -0
    Added storage/ndb/src/kernel/blocks/dblqh/ndbd_redo_log_reader to the ignore list

  cluster_change_hist.txt
    1.13 07/03/09 10:27:43 tomas@stripped +10 -1
    change hist

# 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-telco-6.1_2

--- 1.426/configure.in	2007-02-14 12:37:58 +07:00
+++ 1.427/configure.in	2007-03-09 10:27:44 +07:00
@@ -7,12 +7,12 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.15-ndb-6.1.3)
+AM_INIT_AUTOMAKE(mysql, 5.1.15-ndb-6.1.5)
 AM_CONFIG_HEADER(config.h)
 
 NDB_VERSION_MAJOR=6
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=3
+NDB_VERSION_BUILD=5
 NDB_VERSION_STATUS="-beta"
 
 PROTOCOL_VERSION=10

--- 1.12/cluster_change_hist.txt	2007-03-07 14:32:56 +07:00
+++ 1.13/cluster_change_hist.txt	2007-03-09 10:27:43 +07:00
@@ -2,11 +2,20 @@
 mysql-5.1.15-ndb-6.1.X
 ==================================================
 
-mysql-5.1.15-ndb-6.1.4 (limited test release)
+mysql-5.1.15-ndb-6.1.5 (not released yet)
 
+  Bug #25743 - If undo_buffer_size (for LG) greater than the inital shared memory
(default 20M), ndbd nodes are crashed
   Bug #26899 - ndb_restore cannot restore selected tables and databases
   Bug #26900 - ndb_restore printout option does not give structured data
   Bug #26720 - Infinite loop on unknown signal in logging function
+
+  * ndb_apply_status schema change
+  * ndb_restore options for printing to file
+
+  Note: since ndb_apply_status schema change this version is not backwards compatible
+
+mysql-5.1.15-ndb-6.1.4 (limited test release)
+
   Bug #26741 - ndb_restore with only print_data seg faults
   Bug #26739 - ndb_restore segfault on some 64-bit architectures
   Bug #26663 - cluster have issues with api nodeids > 63

--- 1.28/storage/ndb/src/common/util/version.c	2007-02-21 19:46:49 +07:00
+++ 1.29/storage/ndb/src/common/util/version.c	2007-03-09 10:27:44 +07:00
@@ -104,7 +104,9 @@ void ndbSetOwnVersion() {}
 
 #ifndef TEST_VERSION
 struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
-  { MAKE_VERSION(6,1,NDB_VERSION_BUILD), MAKE_VERSION(6,1,2), UG_Range},
+  { MAKE_VERSION(6,1,NDB_VERSION_BUILD), MAKE_VERSION(6,1,5), UG_Range},
+  /* ndb_apply_status table changed, and no compatability code written */
+  { MAKE_VERSION(6,1,4), MAKE_VERSION(6,1,2), UG_Range},
   { MAKE_VERSION(5,1,NDB_VERSION_BUILD), MAKE_VERSION(5,1,0), UG_Range},
   { MAKE_VERSION(5,0,NDB_VERSION_BUILD), MAKE_VERSION(5,0,12), UG_Range},
   { MAKE_VERSION(5,0,11), MAKE_VERSION(5,0,2), UG_Range},

--- 1.271/BitKeeper/etc/ignore	2007-02-21 20:47:32 +07:00
+++ 1.272/BitKeeper/etc/ignore	2007-03-09 10:27:44 +07:00
@@ -2937,3 +2937,4 @@ zlib/*.vcproj
 storage/archive/archive_reader
 storage/ndb/test/ndbapi/testIndexStat
 storage/ndb/test/ndbapi/testInterpreter
+storage/ndb/src/kernel/blocks/dblqh/ndbd_redo_log_reader