bk commit into 6.0 tree (mkindahl:1.2543)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl.  When mkindahl 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-05 13:42:32+01:00, mkindahl@stripped +1 -0
  Reverting a patch to symlink.test

  mysql-test/t/symlink.test@stripped, 2008-02-05 13:42:23+01:00, mkindahl@stripped +1 -1
    Reverting a patch attempting to fix a problem already present
    elsewhere.

diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-02-05 08:40:30 +01:00
+++ b/mysql-test/t/symlink.test	2008-02-05 13:42:23 +01:00
@@ -85,7 +85,7 @@ create table mysqltest.t9 (a int not nul
 eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="$MYSQLTEST_VARDIR/run";
 
 # Should fail becasue the file t9.MYD already exist in 'tmp'
---error 1,1,ER_TABLE_EXISTS_ERROR
+--error 1,1
 eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp";
 enable_query_log;