diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-20 13:45:42 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-20 13:45:42 +0100 |
| commit | 12d1ee5473faecc14137a00b73f8606244cf43d9 (patch) | |
| tree | c518f3c3554eaf727ca41dc821925d2a09e57531 /mysql-test | |
| parent | 0c20ad6c1529a9efe9dcc84cc84039bb36471216 (diff) | |
| download | mariadb-git-12d1ee5473faecc14137a00b73f8606244cf43d9.tar.gz | |
added variable NDB_MGM to be able to run the management client in tests
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
mysql-test/mysql-test-run.sh:
added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
added testcase for Bug#8035
ndb/tools/waiter.cpp:
added option to wait for not-started
sql/lock.cc:
Bug#8035
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 3 | ||||
| -rw-r--r-- | mysql-test/r/ndb_autodiscover.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/ndb_autodiscover.test | 20 |
3 files changed, 33 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 83a13707cdc..e13daa1a5c2 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -540,6 +540,7 @@ if [ x$SOURCE_DIST = x1 ] ; then INSTALL_DB="./install_test_db" MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables" NDB_TOOLS_DIR="$BASEDIR/ndb/tools" + NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm" else if test -x "$BASEDIR/libexec/mysqld" then @@ -566,6 +567,7 @@ else INSTALL_DB="./install_test_db --bin" MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables" NDB_TOOLS_DIR="$CLIENT_BINDIR" + NDB_MGM="$CLIENT_BINDIR/ndb_mgm" if test -d "$BASEDIR/share/mysql/english" then LANGUAGE="$BASEDIR/share/mysql/english/" @@ -615,6 +617,7 @@ MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --u export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES export CLIENT_BINDIR TESTS_BINDIR CHARSETSDIR export NDB_TOOLS_DIR +export NDB_MGM MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \ --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \ diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result index ba7bcd05673..2b8fbb6fda0 100644 --- a/mysql-test/r/ndb_autodiscover.result +++ b/mysql-test/r/ndb_autodiscover.result @@ -359,6 +359,16 @@ information_schema mysql test use test; +drop database if exists test_only_ndb_tables; +create database test_only_ndb_tables; +use test_only_ndb_tables; +create table t1 (a int primary key) engine=ndb; +select * from t1; +a +select * from t1; +ERROR HY000: Can't lock file (errno: 4009) +use test; +drop database test_only_ndb_tables; CREATE TABLE t9 ( a int NOT NULL PRIMARY KEY, b int diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test index 6551732adba..e6bfedc89ed 100644 --- a/mysql-test/t/ndb_autodiscover.test +++ b/mysql-test/t/ndb_autodiscover.test @@ -452,6 +452,26 @@ drop database test2; show databases; use test; +######################################################### +# Bug#8035 +# mysqld would segfault on second select * before bug was fixed +# +--disable_warnings +drop database if exists test_only_ndb_tables; +--enable_warnings +create database test_only_ndb_tables; +use test_only_ndb_tables; +create table t1 (a int primary key) engine=ndb; +select * from t1; +--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null +--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null +--error 1015 +select * from t1; +--exec $NDB_MGM --no-defaults -e "all start" > /dev/null +--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null +use test; +drop database test_only_ndb_tables; + ###################################################### # Note! This should always be the last step in this # file, the table t9 will be used and dropped |