bk commit into 4.1 tree (svoj:1.2693)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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-11-12 15:15:16+04:00, svoj@stripped +1 -0
  After merge fix.

  mysql-test/r/symlink.result@stripped, 2007-11-12 15:15:15+04:00, svoj@stripped +1 -1
    After merge fix.

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2007-11-12 15:02:41 +04:00
+++ b/mysql-test/r/symlink.result	2007-11-12 15:15:15 +04:00
@@ -94,7 +94,7 @@ CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/var/master-data/mysql'
 INDEX DIRECTORY='TEST_DIR/var/master-data/mysql';
 RENAME TABLE t1 TO user;
-Can't create/write to file 'TEST_DIR/var/master-data/mysql/user.MYI' (Errcode: 17)
+ERROR HY000: Can't create/write to file 'TEST_DIR/var/master-data/mysql/user.MYI' (Errcode: 17)
 DROP TABLE t1;
 show create table t1;
 Table	Create Table