bzr push into mysql-5.1-telco-7.0 branch (frazer:3491 to 3493)

[Frazer Clement]

 3493 Frazer Clement	2010-03-31
      Artificial version bump/dump

    modified:
      configure.in
      storage/ndb/include/ndb_version.h.in
 3492 Frazer Clement	2010-03-31
      Add new std_data to make dist

    modified:
      mysql-test/Makefile.am
 3491 Frazer Clement	2010-03-31
      WL4197 Native default value support
      
      Commit to 7.0 clone for CluB / autotest access

    added:
      mysql-test/include/ndb_desc_print.inc
      mysql-test/std_data/ndb_backup_before_native_default/
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1-0.1.Data
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1-0.2.Data
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1.1.ctl
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1.1.log
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1.2.ctl
      mysql-test/std_data/ndb_backup_before_native_default/BACKUP-1.2.log
      mysql-test/suite/ndb/r/ndb_native_default_support.result
      mysql-test/suite/ndb/t/ndb_native_default_support.test
      storage/ndb/test/ndbapi/testNativeDefault.cpp
    modified:
      mysql-test/suite/ndb/r/ndb_restore_promotion.result
      mysql-test/suite/ndb/t/ndb_restore_promotion.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp
      storage/ndb/include/kernel/signaldata/TupFrag.hpp
      storage/ndb/include/ndb_version.h.in
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/include/ndbapi/NdbRecAttr.hpp
      storage/ndb/include/util/UtilBuffer.hpp
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbRecAttr.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/include/NDBT_Table.hpp
      storage/ndb/test/ndbapi/CMakeLists.txt
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/ndbapi/testBitfield.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/ndbapi/testUpgrade.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/src/NDBT_Tables.cpp
=== modified file 'configure.in'
--- a/configure.in	2010-03-26 05:41:26 +0000
+++ b/configure.in	2010-03-31 20:46:25 +0000
@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
 # Remember to also update version.c in ndb.
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AC_INIT([MySQL Server], [5.1.44-ndb-7.0.15], [], [mysql])
+AC_INIT([MySQL Server], [5.1.44-ndb-7.0.16], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in
@@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
 
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=15
+NDB_VERSION_BUILD=16
 NDB_VERSION_STATUS=""
 
 PROTOCOL_VERSION=10

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2010-03-15 14:37:37 +0000
+++ b/mysql-test/Makefile.am	2010-03-31 20:24:10 +0000
@@ -84,6 +84,7 @@ TEST_DIRS = t r include std_data std_dat
 	std_data/ndb_backup51_undolog_be \
 	std_data/ndb_backup51_undolog_le \
 	std_data/ndb_backup_hashmap \
+	std_data/ndb_backup_before_native_default \
 	std_data/funcs_1 \
 	extra/binlog_tests/ extra/rpl_tests \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \

=== modified file 'storage/ndb/include/ndb_version.h.in'
--- a/storage/ndb/include/ndb_version.h.in	2010-03-31 18:15:48 +0000
+++ b/storage/ndb/include/ndb_version.h.in	2010-03-31 20:46:25 +0000
@@ -386,6 +386,6 @@ ndb_route_exec_frag(Uint32 x)
   return x >= NDBD_ROUTE_EXEC_FRAG;
 }
 
-#define NDBD_NATIVE_DEFAULT_SUPPORT NDB_MAKE_VERSION(7,0,15)
+#define NDBD_NATIVE_DEFAULT_SUPPORT NDB_MAKE_VERSION(7,0,16)
 
 #endif


Attachment: [text/bzr-bundle] bzr/[e-mail]