bk commit into 4.1 tree (gluh:1.2708)

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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@stripped, 2008-02-29 16:56:41+04:00, gluh@stripped +2 -0
  test fix

  mysql-test/r/symlink.result@stripped, 2008-02-29 16:56:40+04:00, gluh@stripped +4 -4
    result fix

  mysql-test/t/symlink.test@stripped, 2008-02-29 16:56:40+04:00, gluh@stripped +3 -0
    test fix

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2008-02-29 13:54:59 +04:00
+++ b/mysql-test/r/symlink.result	2008-02-29 16:56:40 +04:00
@@ -140,12 +140,12 @@ CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/var/master-data/test';
 ERROR HY000: Incorrect arguments to DATA DIRECORY
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data/';
+DATA DIRECTORY='TEST_DIR/var/master-data/';
 ERROR HY000: Incorrect arguments to DATA DIRECORY
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data';
+INDEX DIRECTORY='TEST_DIR/var/master-data';
 ERROR HY000: Incorrect arguments to INDEX DIRECORY
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data_var';
-ERROR HY000: Can't create/write to file '/home/gluh/MySQL/Merge/4.1-opt/mysql-test/var/master-data_var/t1.MYI' (Errcode: 2)
+INDEX DIRECTORY='TEST_DIR/var/master-data_var';
+ERROR HY000: Can't create/write to file 'TEST_DIR/var/master-data_var/t1.MYI' (Errcode: 2)
 End of 4.1 tests
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-02-29 13:54:59 +04:00
+++ b/mysql-test/t/symlink.test	2008-02-29 16:56:40 +04:00
@@ -201,12 +201,15 @@ deallocate prepare stmt;
 --error 1210
 eval CREATE TABLE t1(a INT)
 DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/test';
+--replace_result $MYSQL_TEST_DIR TEST_DIR
 --error 1210
 eval CREATE TABLE t1(a INT)
 DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/';
+--replace_result $MYSQL_TEST_DIR TEST_DIR
 --error 1210
 eval CREATE TABLE t1(a INT)
 INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data';
+--replace_result $MYSQL_TEST_DIR TEST_DIR
 --error 1
 eval CREATE TABLE t1(a INT)
 INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var';