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.2091 06/01/30 17:06:31 tomas@stripped +5 -0
added --core option in mysql-test-run for ndb
mysql-test/t/ndb_restore.test
1.14 06/01/30 17:06:24 tomas@stripped +0 -3
removed test printout not used
mysql-test/r/ndb_restore.result
1.9 06/01/30 17:06:24 tomas@stripped +0 -8
removed test printout not used
mysql-test/ndb/ndbcluster.sh
1.48 06/01/30 17:06:24 tomas@stripped +8 -4
added --core option in mysql-test-run for ndb
mysql-test/mysql-test-run.sh
1.293 06/01/30 17:06:24 tomas@stripped +2 -2
added --core option in mysql-test-run for ndb
mysql-test/mysql-test-run.pl
1.58 06/01/30 17:06:24 tomas@stripped +8 -4
added --core option in mysql-test-run for ndb
# 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/mysql51
--- 1.292/mysql-test/mysql-test-run.sh 2006-01-23 12:31:46 +01:00
+++ 1.293/mysql-test/mysql-test-run.sh 2006-01-30 17:06:24 +01:00
@@ -1278,7 +1278,7 @@
then
NDBCLUSTER_EXTRA_OPTS="--small"
fi
- OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir"
+ OPTS="$NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --verbose=$NDB_VERBOSE --initial --relative-config-data-dir --core"
if [ "x$NDB_VERBOSE" != "x0" ] ; then
echo "Starting master ndbcluster " $OPTS
fi
@@ -1511,7 +1511,7 @@
NDBCLUSTER_EXTRA_OPTS="--small"
fi
- OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=$NDB_VERBOSE --relative-config-data-dir"
+ OPTS="$NDBCLUSTER_OPTS_SLAVE --initial $NDBCLUSTER_EXTRA_OPTS --ndbd-nodes=1 --verbose=$NDB_VERBOSE --relative-config-data-dir --core"
if [ "x$NDB_VERBOSE" != "x0" ] ; then
echo "Starting slave ndbcluster " $OPTS
fi
--- 1.57/mysql-test/mysql-test-run.pl 2006-01-23 12:31:46 +01:00
+++ 1.58/mysql-test/mysql-test-run.pl 2006-01-30 17:06:24 +01:00
@@ -1374,7 +1374,8 @@
"--verbose=2",
$ndbcluster_opts,
"--initial",
- "--relative-config-data-dir"],
+ "--relative-config-data-dir",
+ "--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install");
@@ -1410,7 +1411,8 @@
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port",
"--data-dir=$opt_vardir",
- "--verbose=2"],
+ "--verbose=2",
+ "--core"],
"", "/dev/null", "", "") )
{
mtr_error("Error ndbcluster_start");
@@ -1467,7 +1469,8 @@
"--small",
"--ndbd-nodes=1",
"--initial",
- "--relative-config-data-dir"],
+ "--relative-config-data-dir",
+ "--core"],
"", "", "", "") )
{
mtr_error("Error ndbcluster_install_slave");
@@ -1501,7 +1504,8 @@
["--port=$opt_ndbcluster_port_slave",
"--data-dir=$opt_vardir",
"--verbose=2",
- "--ndbd-nodes=1"],
+ "--ndbd-nodes=1",
+ "--core"],
"", "/dev/null", "", "") )
{
mtr_error("Error ndbcluster_start_slave");
--- 1.47/mysql-test/ndb/ndbcluster.sh 2006-01-23 10:41:55 +01:00
+++ 1.48/mysql-test/ndb/ndbcluster.sh 2006-01-30 17:06:24 +01:00
@@ -53,6 +53,7 @@
ndb_diskless=0
ndbd_nodes=2
relative_config_data_dir=
+opt_core=
ndb_no_ord=512
ndb_no_attr=2048
@@ -118,6 +119,9 @@
--ndbd-extra-opts=*)
NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
;;
+ --core)
+ opt_core="--core"
+ ;;
--verbose=*)
VERBOSE=`echo "$1" | sed -e "s;--verbose=;;"`
;;
@@ -153,10 +157,10 @@
exit 1
fi
-exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS"
-exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"
-exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"
-exec_waiter="$exec_waiter --no-defaults"
+exec_mgmtclient="$exec_mgmtclient --no-defaults $opt_core $NDB_MGM_EXTRA_OPTS"
+exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS"
+exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS"
+exec_waiter="$exec_waiter --no-defaults $opt_core"
ndb_host="localhost"
ndb_mgmd_port=$port
--- 1.8/mysql-test/r/ndb_restore.result 2006-01-19 19:32:52 +01:00
+++ 1.9/mysql-test/r/ndb_restore.result 2006-01-30 17:06:24 +01:00
@@ -1,14 +1,6 @@
use test;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
-id type state logging database schema name
-2 UserTable Online Yes cluster_replication def apply_status
-1 SystemTable Online Yes sys def NDB$EVENTS_0
-3 UserTable Online Yes cluster_replication def schema
-0 SystemTable Online Yes sys def SYSTAB_0
-
-NDBT_ProgramExit: 0 - OK
-
CREATE TABLE `t1_c` (
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`goaledatta` char(2) NOT NULL default '',
--- 1.13/mysql-test/t/ndb_restore.test 2006-01-19 19:32:53 +01:00
+++ 1.14/mysql-test/t/ndb_restore.test 2006-01-30 17:06:24 +01:00
@@ -8,9 +8,6 @@
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
--enable_warnings
---exec $NDB_TOOLS_DIR/ndb_show_tables
---exec $NDB_MGM --no-defaults -e "all dump 1000" >> $NDB_TOOLS_OUTPUT
-
CREATE TABLE `t1_c` (
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`goaledatta` char(2) NOT NULL default '',
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2091) | tomas | 30 Jan |
