bk commit into 5.1 tree (gluh:1.2578)

[gluh]

Below is the list of changes that have just been committed into a local
5.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 17:58:35+04:00, gluh@stripped +2 -0
  fixed problem with embedded server

  mysql-test/r/symlink.result@stripped, 2008-02-29 17:58:33+04:00, gluh@stripped +1 -1
    test result fix

  mysql-test/t/symlink.test@stripped, 2008-02-29 17:58:33+04:00, gluh@stripped +1 -1
    fixed problem with embedded server

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2008-02-29 16:59:08 +04:00
+++ b/mysql-test/r/symlink.result	2008-02-29 17:58:33 +04:00
@@ -133,7 +133,7 @@ drop table t1;
 End of 4.1 tests
 SET SESSION keep_files_on_create = TRUE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
-ERROR HY000: Can't create/write to file './test/t1.MYD' (Errcode: 17)
+Got one of the listed errors
 SET SESSION keep_files_on_create = FALSE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 DROP TABLE t1;
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-02-29 16:59:17 +04:00
+++ b/mysql-test/t/symlink.test	2008-02-29 17:58:33 +04:00
@@ -186,7 +186,7 @@ SET SESSION keep_files_on_create = TRUE;
 --write_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD
 EOF
 --disable_abort_on_error
---error 1
+--error 1,1,ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD;