Commit 375afff3 authored by unknown's avatar unknown
Browse files

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.


mysql-test/r/partition_mgm_err.result:
  added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
  removed the /var/tmp path elements since there is not guarantee that
  other build setups will include this path
parent 456524c0

mysql-test/r/partition_mgm_err.result

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ ALTER TABLE t1 DROP PARTITION x1; 
ALTER TABLE t1 DROP PARTITION x0;

ERROR HY000: Cannot remove all partitions, use DROP TABLE instead

DROP TABLE t1;

INSERT INTO t1 VALUES (15);

DROP TABLE t1;

CREATE TABLE t1 ( id INT NOT NULL,

fname VARCHAR(50) NOT NULL,

lname VARCHAR(50) NOT NULL,

mysql-test/t/partition_mgm_err.test

+8 −7
Original line number Diff line number Diff line
@@ -171,18 +171,19 @@ DROP TABLE t1; 
#

# BUG: 14354 Partitions: data directory clause fails

#

--exec rm -rf $MYSQL_TEST_DIR/var/tmp/bug14354

--exec mkdir $MYSQL_TEST_DIR/var/tmp/bug14354

--exec rm -rf $MYSQL_TEST_DIR/bug14354

--exec mkdir $MYSQL_TEST_DIR/bug14354

disable_query_log;

eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (

PARTITION p1 VALUES LESS THAN (20) ENGINE=myiasm 

DATA DIRECTORY="$MYSQL_TEST_DIR/var/tmp/bug14354" 

INDEX DIRECTORY="$MYSQL_TEST_DIR/var/tmp/bug14354");

DATA DIRECTORY="$MYSQL_TEST_DIR/bug14354" 

INDEX DIRECTORY="$MYSQL_TEST_DIR/bug14354");

enable_query_log;

--exec test -f $MYSQL_TEST_DIR/var/tmp/bug14354/t1_p1.MYD

--exec test -f $MYSQL_TEST_DIR/var/tmp/bug14354/t1_p1.MYI

INSERT INTO t1 VALUES (15);

--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;

--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