bk commit into 5.1 tree (gshchepa:1.2552) BUG#29325

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.1 repository of uchum. When uchum 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, 2007-07-14 01:34:46+05:00, gshchepa@stripped +2 -0
  symlink.test, symlink.result:
    Minor fix for test case of bug #29325 to make emb test happy.

  mysql-test/r/symlink.result@stripped, 2007-07-14 01:33:55+05:00, gshchepa@stripped +1 -1
    Minor fix for test case of bug #29325 to make emb test happy.

  mysql-test/t/symlink.test@stripped, 2007-07-14 01:32:40+05:00, gshchepa@stripped +1 -0
    Minor fix for test case of bug #29325 to make emb test happy.

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2007-07-13 19:08:05 +05:00
+++ b/mysql-test/r/symlink.result	2007-07-14 01:33:55 +05:00
@@ -144,7 +144,7 @@ RESET QUERY CACHE;
 USE db1;
 SET SESSION keep_files_on_create = TRUE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
-ERROR HY000: Can't create/write to file './db1/t1.MYD' (Errcode: 17)
+Got one of the listed errors
 CREATE TABLE t3 (a INT) Engine=MyISAM;
 INSERT INTO t3 VALUES (1),(2),(3);
 TRUNCATE TABLE t3;
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2007-07-13 19:08:05 +05:00
+++ b/mysql-test/t/symlink.test	2007-07-14 01:32:40 +05:00
@@ -196,6 +196,7 @@ USE db1;
 #no warning from create table
 SET SESSION keep_files_on_create = TRUE;
 --disable_abort_on_error
+--error 1,1
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 --enable_abort_on_error