bk commit into 5.0 tree (gluh:1.2597)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 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-03-03 15:02:34+04:00, gluh@stripped +2 -0
  test case fix

  mysql-test/r/symlink.result@stripped, 2008-03-03 15:02:32+04:00, gluh@stripped +4 -4
    test case fix

  mysql-test/t/symlink.test@stripped, 2008-03-03 15:02:32+04:00, gluh@stripped +4 -4
    test case fix

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2008-02-29 16:58:19 +04:00
+++ b/mysql-test/r/symlink.result	2008-03-03 15:02:32 +04:00
@@ -147,16 +147,16 @@ drop table t1;
 deallocate prepare stmt;
 CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/var/master-data/test';
-ERROR HY000: Incorrect arguments to DATA DIRECORY
+Got one of the listed errors
 CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/var/master-data/';
-ERROR HY000: Incorrect arguments to DATA DIRECORY
+Got one of the listed errors
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/var/master-data';
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
+Got one of the listed errors
 CREATE TABLE t1(a INT)
 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)
+Got one of the listed errors
 End of 4.1 tests
 SET SESSION keep_files_on_create = TRUE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-02-29 16:57:11 +04:00
+++ b/mysql-test/t/symlink.test	2008-03-03 15:02:32 +04:00
@@ -204,19 +204,19 @@ deallocate prepare stmt;
 # Bug#32167 another privilege bypass with DATA/INDEX DIRECORY
 #
 --replace_result $MYSQL_TEST_DIR TEST_DIR
---error 1210
+--error 1,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
+--error 1,1210
 eval CREATE TABLE t1(a INT)
 DATA DIRECTORY='$MYSQL_TEST_DIR/var/master-data/';
 --replace_result $MYSQL_TEST_DIR TEST_DIR
---error 1210
+--error 1,1210
 eval CREATE TABLE t1(a INT)
 INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data';
 --replace_result $MYSQL_TEST_DIR TEST_DIR
---error 1
+--error 1,1210
 eval CREATE TABLE t1(a INT)
 INDEX DIRECTORY='$MYSQL_TEST_DIR/var/master-data_var';