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.2435 07/02/14 15:58:06 tomas@stripped +22 -0
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-merge
storage/ndb/test/run-test/main.cpp
1.31 07/02/14 15:57:50 tomas@stripped +0 -3
Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp
1.5 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp
1.14 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp
1.110 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp
1.19 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp
1.37 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.121 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
1.28 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp
1.86 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp
1.8 07/02/14 15:57:50 tomas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.105 07/02/14 15:57:50 tomas@stripped +0 -2
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
1.45 07/02/14 15:57:49 tomas@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp
1.38 07/02/14 15:57:49 tomas@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
1.17 07/02/14 15:57:49 tomas@stripped +0 -0
Auto merged
sql/mysqld.cc
1.620 07/02/14 15:57:49 tomas@stripped +0 -0
Auto merged
sql/item_func.cc
1.355 07/02/14 15:57:49 tomas@stripped +0 -0
Auto merged
sql/ha_ndbcluster.cc
1.412 07/02/14 15:57:48 tomas@stripped +0 -0
Auto merged
mysql-test/ndb/ndb_config_2_node.ini
1.22 07/02/14 15:57:47 tomas@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.271 07/02/14 15:57:47 tomas@stripped +0 -0
Auto merged
configure.in
1.435 07/02/14 15:57:47 tomas@stripped +0 -0
Auto merged
config/ac-macros/ha_ndbcluster.m4
1.26 07/02/14 15:57:47 tomas@stripped +0 -0
Auto merged
BitKeeper/etc/ignore
1.277 07/02/14 15:57:16 tomas@stripped +1 -1
auto-union
# 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-merge/RESYNC
--- 1.434/configure.in 2007-02-06 21:52:22 +07:00
+++ 1.435/configure.in 2007-02-14 15:57:47 +07:00
@@ -7,8 +7,13 @@ 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.16-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.16-ndb-6.2.0)
AM_CONFIG_HEADER(config.h)
+
+NDB_VERSION_MAJOR=6
+NDB_VERSION_MINOR=2
+NDB_VERSION_BUILD=0
+NDB_VERSION_STATUS="-beta"
PROTOCOL_VERSION=10
DOT_FRM_VERSION=6
--- 1.619/sql/mysqld.cc 2007-02-14 10:17:43 +07:00
+++ 1.620/sql/mysqld.cc 2007-02-14 15:57:49 +07:00
@@ -413,7 +413,7 @@ const char *opt_ndb_connectstring= 0;
char opt_ndb_constrbuf[1024];
unsigned opt_ndb_constrbuf_len= 0;
my_bool opt_ndb_shm, opt_ndb_optimized_node_selection;
-ulong opt_ndb_cache_check_time;
+ulong opt_ndb_cache_check_time, opt_ndb_wait_connected;
const char *opt_ndb_mgmd;
ulong opt_ndb_nodeid;
ulong ndb_extra_logging;
@@ -4764,6 +4764,7 @@ enum options_mysqld
OPT_NDB_USE_EXACT_COUNT, OPT_NDB_USE_TRANSACTIONS,
OPT_NDB_FORCE_SEND, OPT_NDB_AUTOINCREMENT_PREFETCH_SZ,
OPT_NDB_SHM, OPT_NDB_OPTIMIZED_NODE_SELECTION, OPT_NDB_CACHE_CHECK_TIME,
+ OPT_NDB_WAIT_CONNECTED,
OPT_NDB_MGMD, OPT_NDB_NODEID,
OPT_NDB_DISTRIBUTION,
OPT_NDB_INDEX_STAT_ENABLE,
@@ -5484,6 +5485,12 @@ Disable with --skip-ndbcluster (will sav
(gptr*) &global_system_variables.ndb_use_copying_alter_table,
(gptr*) &global_system_variables.ndb_use_copying_alter_table,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+ { "ndb-wait-connected", OPT_NDB_WAIT_CONNECTED,
+ "Time (in seconds) for mysqld to wait for connection to cluster management and data nodes.",
+ (gptr*) &opt_ndb_wait_connected, (gptr*) &opt_ndb_wait_connected,
+ 0, GET_ULONG, REQUIRED_ARG, 0, 0, LONG_TIMEOUT, 0, 0, 0},
+#endif
{"new", 'n', "Use very new possible 'unsafe' functions.",
(gptr*) &global_system_variables.new_mode,
(gptr*) &max_system_variables.new_mode,
--- 1.25/config/ac-macros/ha_ndbcluster.m4 2007-01-20 08:06:51 +07:00
+++ 1.26/config/ac-macros/ha_ndbcluster.m4 2007-02-14 15:57:47 +07:00
@@ -2,15 +2,10 @@ dnl ------------------------------------
dnl Macro: MYSQL_CHECK_NDBCLUSTER
dnl ---------------------------------------------------------------------------
-NDB_VERSION_MAJOR=`echo $VERSION | cut -d. -f1`
-NDB_VERSION_MINOR=`echo $VERSION | cut -d. -f2`
-NDB_VERSION_BUILD=`echo $VERSION | cut -d. -f3 | cut -d- -f1`
-NDB_VERSION_STATUS=`echo $VERSION | cut -d- -f2`
-# if there was now -suffix, $NDB_VERSION_STATUS will be the same as $VERSION
-if test "$NDB_VERSION_STATUS" = "$VERSION"
-then
- NDB_VERSION_STATUS=""
-fi
+NDB_MYSQL_VERSION_MAJOR=`echo $VERSION | cut -d. -f1`
+NDB_MYSQL_VERSION_MINOR=`echo $VERSION | cut -d. -f2`
+NDB_MYSQL_VERSION_BUILD=`echo $VERSION | cut -d. -f3 | cut -d- -f1`
+
TEST_NDBCLUSTER=""
dnl for build ndb docs
@@ -301,6 +296,17 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
[NDB build version])
AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
[NDB status version])
+
+
+ AC_SUBST(NDB_MYSQL_VERSION_MAJOR)
+ AC_SUBST(NDB_MYSQL_VERSION_MINOR)
+ AC_SUBST(NDB_MYSQL_VERSION_BUILD)
+ AC_DEFINE_UNQUOTED([NDB_MYSQL_VERSION_MAJOR], [$NDB_MYSQL_VERSION_MAJOR],
+ [MySQL major version])
+ AC_DEFINE_UNQUOTED([NDB_MYSQL_VERSION_MINOR], [$NDB_MYSQL_VERSION_MINOR],
+ [MySQL minor version])
+ AC_DEFINE_UNQUOTED([NDB_MYSQL_VERSION_BUILD], [$NDB_MYSQL_VERSION_BUILD],
+ [MySQL build version])
AC_SUBST(ndbcluster_includes)
AC_SUBST(ndbcluster_libs)
--- 1.270/mysql-test/mysql-test-run.pl 2007-02-06 22:38:53 +07:00
+++ 1.271/mysql-test/mysql-test-run.pl 2007-02-14 15:57:47 +07:00
@@ -3655,6 +3655,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$cluster->{'connect_string'});
+ mtr_add_arg($args, "%s--ndb-wait-connected=20", $prefix);
if ( $mysql_version_id >= 50100 )
{
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
@@ -3746,6 +3747,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$clusters->[$slave->[$idx]->{'cluster'}]->{'connect_string'});
+ mtr_add_arg($args, "%s--ndb-wait-connected=20", $prefix);
if ( $mysql_version_id >= 50100 )
{
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
--- 1.37/storage/ndb/src/common/debugger/EventLogger.cpp 2007-02-12 15:00:08 +07:00
+++ 1.38/storage/ndb/src/common/debugger/EventLogger.cpp 2007-02-14 15:57:49 +07:00
@@ -545,8 +545,8 @@ void getTextUndoLogBlocked(QQQQ) {
void getTextTransporterError(QQQQ) {
struct myTransporterError{
- int errorNum;
- char errorString[256];
+ Uint32 errorNum;
+ char errorString[256];
};
int i = 0;
int lenth = 0;
--- 1.276/BitKeeper/etc/ignore 2007-02-13 16:27:20 +07:00
+++ 1.277/BitKeeper/etc/ignore 2007-02-14 15:57:16 +07:00
@@ -2638,6 +2638,7 @@ storage/ndb/src/kernel/blocks/dbdict/ndb
storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+storage/ndb/src/kernel/blocks/dblqh/ndbd_redo_log_reader
storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
storage/ndb/src/kernel/blocks/dbtup/test_varpage
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2435) | tomas | 14 Feb |
