bk commit into 5.1 tree (reggie:1.2081) BUG#14354

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of reggie. When reggie 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.2081 06/01/25 21:48:29 reggie@stripped +2 -0
  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/t/partition_mgm_err.test
    1.7 06/01/25 21:46:24 reggie@stripped +8 -7
    removed the /var/tmp path elements since there is not guarantee that
    other build setups will include this path

  mysql-test/r/partition_mgm_err.result
    1.7 06/01/25 21:46:23 reggie@stripped +2 -0
    added a row insert just to make sure the data and index files are made

# 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/work/mysql-5.1

--- 1.6/mysql-test/r/partition_mgm_err.result	2006-01-25 13:06:52 -06:00
+++ 1.7/mysql-test/r/partition_mgm_err.result	2006-01-25 21:46:23 -06:00
@@ -112,6 +112,8 @@
 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,

--- 1.6/mysql-test/t/partition_mgm_err.test	2006-01-25 13:09:55 -06:00
+++ 1.7/mysql-test/t/partition_mgm_err.test	2006-01-25 21:46:24 -06:00
@@ -171,18 +171,19 @@
 #
 # 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