database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

added --core option in mysql-test-run for ndb

Browse Source 
mysql-test/r/ndb_restore.result:
  removed test printout not used
mysql-test/t/ndb_restore.test:
  removed test printout not used
This commit is contained in:
unknown
2006-01-30 17:06:31 +01:00
parent 701347bc2e
commit 5a60eba217
5 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/mysql-test-run.pl
View File

@ -1374,7 +1374,8 @@ sub ndbcluster_install () {
"--verbose=2", "--verbose=2",
$ndbcluster_opts, $ndbcluster_opts,
"--initial", "--initial",
"--relative-config-data-dir"], "--relative-config-data-dir",
"--core"],
"", "", "", "") ) "", "", "", "") )
{ {
mtr_error("Error ndbcluster_install"); mtr_error("Error ndbcluster_install");
@ -1410,7 +1411,8 @@ sub ndbcluster_start ($) {
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port", ["--port=$opt_ndbcluster_port",
"--data-dir=$opt_vardir", "--data-dir=$opt_vardir",
"--verbose=2"], "--verbose=2",
"--core"],
"", "/dev/null", "", "") ) "", "/dev/null", "", "") )
{ {
mtr_error("Error ndbcluster_start"); mtr_error("Error ndbcluster_start");
@ -1467,7 +1469,8 @@ sub ndbcluster_install_slave () {
"--small", "--small",
"--ndbd-nodes=1", "--ndbd-nodes=1",
"--initial", "--initial",
"--relative-config-data-dir"], "--relative-config-data-dir",
"--core"],
"", "", "", "") ) "", "", "", "") )
{ {
mtr_error("Error ndbcluster_install_slave"); mtr_error("Error ndbcluster_install_slave");
@ -1501,7 +1504,8 @@ sub ndbcluster_start_slave ($) {
["--port=$opt_ndbcluster_port_slave", ["--port=$opt_ndbcluster_port_slave",
"--data-dir=$opt_vardir", "--data-dir=$opt_vardir",
"--verbose=2", "--verbose=2",
"--ndbd-nodes=1"], "--ndbd-nodes=1",
"--core"],
"", "/dev/null", "", "") ) "", "/dev/null", "", "") )
{ {
mtr_error("Error ndbcluster_start_slave"); mtr_error("Error ndbcluster_start_slave");

4
mysql-test/mysql-test-run.sh
View File

@ -1278,7 +1278,7 @@ start_ndbcluster()
then then
NDBCLUSTER_EXTRA_OPTS="--small" NDBCLUSTER_EXTRA_OPTS="--small"
fi 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 if [ "x$NDB_VERBOSE" != "x0" ] ; then
echo "Starting master ndbcluster " $OPTS echo "Starting master ndbcluster " $OPTS
fi fi
@ -1511,7 +1511,7 @@ start_slave()
NDBCLUSTER_EXTRA_OPTS="--small" NDBCLUSTER_EXTRA_OPTS="--small"
fi 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 if [ "x$NDB_VERBOSE" != "x0" ] ; then
echo "Starting slave ndbcluster " $OPTS echo "Starting slave ndbcluster " $OPTS
fi fi

12
mysql-test/ndb/ndbcluster.sh
View File

@ -53,6 +53,7 @@ status_ndb=
ndb_diskless=0 ndb_diskless=0
ndbd_nodes=2 ndbd_nodes=2
relative_config_data_dir= relative_config_data_dir=
opt_core=
ndb_no_ord=512 ndb_no_ord=512
ndb_no_attr=2048 ndb_no_attr=2048
@ -118,6 +119,9 @@ while test $# -gt 0; do
--ndbd-extra-opts=*) --ndbd-extra-opts=*)
NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"` NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
;; ;;
--core)
opt_core="--core"
;;
--verbose=*) --verbose=*)
VERBOSE=`echo "$1" | sed -e "s;--verbose=;;"` VERBOSE=`echo "$1" | sed -e "s;--verbose=;;"`
;; ;;
@ -153,10 +157,10 @@ if [ ! -f "$config_ini" ]; then
exit 1 exit 1
fi fi
exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS" exec_mgmtclient="$exec_mgmtclient --no-defaults $opt_core $NDB_MGM_EXTRA_OPTS"
exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS" exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS"
exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS" exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS"
exec_waiter="$exec_waiter --no-defaults" exec_waiter="$exec_waiter --no-defaults $opt_core"
ndb_host="localhost" ndb_host="localhost"
ndb_mgmd_port=$port ndb_mgmd_port=$port

8
mysql-test/r/ndb_restore.result
View File

@ -1,14 +1,6 @@
use test; use test;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; 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; 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` ( CREATE TABLE `t1_c` (
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment, `capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`goaledatta` char(2) NOT NULL default '', `goaledatta` char(2) NOT NULL default '',

3
mysql-test/t/ndb_restore.test
View File

@ -8,9 +8,6 @@ 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; drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
--enable_warnings --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` ( CREATE TABLE `t1_c` (
`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment, `capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,
`goaledatta` char(2) NOT NULL default '', `goaledatta` char(2) NOT NULL default '',