Commit 86096789 authored by reggie@linux.site's avatar reggie@linux.site

fixed test issues with bug #14354. I had mistakenly included

/var/tmp in my path when testing data diretory.  the var directory
exists in a src tree but may not exist in a different testing
build setup.
parent 570bffe8
...@@ -112,6 +112,8 @@ ALTER TABLE t1 DROP PARTITION x1; ...@@ -112,6 +112,8 @@ ALTER TABLE t1 DROP PARTITION x1;
ALTER TABLE t1 DROP PARTITION x0; ALTER TABLE t1 DROP PARTITION x0;
ERROR HY000: Cannot remove all partitions, use DROP TABLE instead ERROR HY000: Cannot remove all partitions, use DROP TABLE instead
DROP TABLE t1; DROP TABLE t1;
INSERT INTO t1 VALUES (15);
DROP TABLE t1;
CREATE TABLE t1 ( id INT NOT NULL, CREATE TABLE t1 ( id INT NOT NULL,
fname VARCHAR(50) NOT NULL, fname VARCHAR(50) NOT NULL,
lname VARCHAR(50) NOT NULL, lname VARCHAR(50) NOT NULL,
......
...@@ -171,18 +171,19 @@ DROP TABLE t1; ...@@ -171,18 +171,19 @@ DROP TABLE t1;
# #
# BUG: 14354 Partitions: data directory clause fails # BUG: 14354 Partitions: data directory clause fails
# #
--exec rm -rf $MYSQL_TEST_DIR/var/tmp/bug14354 --exec rm -rf $MYSQL_TEST_DIR/bug14354
--exec mkdir $MYSQL_TEST_DIR/var/tmp/bug14354 --exec mkdir $MYSQL_TEST_DIR/bug14354
disable_query_log; disable_query_log;
eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) ( eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (
PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm
DATA DIRECTORY="$MYSQL_TEST_DIR/var/tmp/bug14354" DATA DIRECTORY="$MYSQL_TEST_DIR/bug14354"
INDEX DIRECTORY="$MYSQL_TEST_DIR/var/tmp/bug14354"); INDEX DIRECTORY="$MYSQL_TEST_DIR/bug14354");
enable_query_log; enable_query_log;
--exec test -f $MYSQL_TEST_DIR/var/tmp/bug14354/t1_p1.MYD INSERT INTO t1 VALUES (15);
--exec test -f $MYSQL_TEST_DIR/var/tmp/bug14354/t1_p1.MYI --exec test -f $MYSQL_TEST_DIR/bug14354/t1#P#p1.MYD
--exec test -f $MYSQL_TEST_DIR/bug14354/t1#P#p1.MYI
DROP TABLE t1; DROP TABLE t1;
--exec rm -rf $MYSQL_TEST_DIR/var/tmp/bug14354 --exec rm -rf $MYSQL_TEST_DIR/bug14354
# #
# Bug# 16534 - Trying to add multiple partitions crashes server # Bug# 16534 - Trying to add multiple partitions crashes server
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment