bzr push into mysql-trunk branch (kevin.lewis:3879 to 3880)

[kevin.lewis]

 3880 kevin.lewis@stripped	2012-02-10
      Enhanced test for WL6145 to show that DATA DIRECTORY is
      displayed by SHOW CREATE TABLE.

    modified:
      mysql-test/r/archive_symlink.result
      mysql-test/t/archive_symlink.test
 3879 kevin.lewis@stripped	2012-02-10
      Testcases for WL#6145

    added:
      mysql-test/r/archive_no_symlink.result
      mysql-test/r/archive_symlink.result
      mysql-test/t/archive_no_symlink-master.opt
      mysql-test/t/archive_no_symlink.test
      mysql-test/t/archive_symlink.test
=== modified file 'mysql-test/r/archive_symlink.result'
--- a/mysql-test/r/archive_symlink.result	revid:kevin.lewis@stripped
+++ b/mysql-test/r/archive_symlink.result	revid:kevin.lewis@stripped
@@ -15,11 +15,14 @@ Warning	1618	<INDEX DIRECTORY> option ig
 INSERT INTO t1 VALUES (NULL, "blue");
 INSERT INTO t1 VALUES (NULL, "red");
 INSERT INTO t1 VALUES (NULL, "yellow");
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
-# Checking if archive file exists in DATA DIRECTORY
+# Checking if archive file exists where we specified in DATA DIRECTORY
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL AUTO_INCREMENT,
+  `b` char(30) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=ARCHIVE AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/archive/'
 DROP TABLE t1;
 # 
 # Be sure SQL MODE "NO_DIR_IN_CREATE" prevents the use of DATA DIRECTORY
@@ -36,7 +39,7 @@ Warning	1618	<DATA DIRECTORY> option ign
 INSERT INTO t1 VALUES (NULL, "blue");
 INSERT INTO t1 VALUES (NULL, "red");
 INSERT INTO t1 VALUES (NULL, "yellow");
-# Checking if archive file exists in --datadir
+# Checking if archive file exists in --datadir since DATA DIRECTORY was ignored.
 DROP TABLE t1;
 set @@sql_mode=@org_mode;
 # 

=== modified file 'mysql-test/t/archive_symlink.test'
--- a/mysql-test/t/archive_symlink.test	revid:kevin.lewis@stripped
+++ b/mysql-test/t/archive_symlink.test	revid:kevin.lewis@stripped
@@ -28,12 +28,10 @@ eval CREATE TABLE t1 (a int AUTO_INCREME
 INSERT INTO t1 VALUES (NULL, "blue");
 INSERT INTO t1 VALUES (NULL, "red");
 INSERT INTO t1 VALUES (NULL, "yellow");
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
-INSERT INTO t1 SELECT NULL, b FROM t1;
---echo # Checking if archive file exists in DATA DIRECTORY
+--echo # Checking if archive file exists where we specified in DATA DIRECTORY
 --file_exists $MYSQL_TMP_DIR/archive/t1.ARZ
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
 --echo # 
@@ -48,7 +46,7 @@ eval CREATE TABLE t1 (a int AUTO_INCREME
 INSERT INTO t1 VALUES (NULL, "blue");
 INSERT INTO t1 VALUES (NULL, "red");
 INSERT INTO t1 VALUES (NULL, "yellow");
---echo # Checking if archive file exists in --datadir
+--echo # Checking if archive file exists in --datadir since DATA DIRECTORY was ignored.
 --file_exists $MYSQLD_DATADIR/test/t1.ARZ
 DROP TABLE t1;
 set @@sql_mode=@org_mode;

No bundle (reason: useless for push emails).