bk commit into 5.0 tree (gkodinov:1.2537)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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-13 16:32:29+03:00, gkodinov@stripped +2 -0
  disabled the output of the full path in tesing bug 29325

  mysql-test/r/symlink.result@stripped, 2007-07-13 16:32:27+03:00, gkodinov@stripped +0 -2
    disabled the output of the full path in tesing bug 29325

  mysql-test/t/symlink.test@stripped, 2007-07-13 16:32:27+03:00, gkodinov@stripped +2 -0
    disabled the output of the full path in tesing bug 29325

diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2007-07-13 13:56:21 +03:00
+++ b/mysql-test/r/symlink.result	2007-07-13 16:32:27 +03:00
@@ -136,8 +136,6 @@ End of 4.1 tests
 CREATE DATABASE db1;
 CREATE DATABASE db2;
 USE db2;
-CREATE TABLE t1 (b INT) ENGINE MYISAM
-DATA DIRECTORY = '/home/kgeorge/mysql/work/B29325-winfix-5.0-opt/mysql-test/var/master-data/db1/';
 INSERT INTO db2.t1 VALUES (1);
 SELECT * FROM db2.t1;
 b
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2007-07-13 13:56:21 +03:00
+++ b/mysql-test/t/symlink.test	2007-07-13 16:32:27 +03:00
@@ -186,8 +186,10 @@ CREATE DATABASE db1; 
 CREATE DATABASE db2;
 
 USE db2;
+--disable_query_log
 eval CREATE TABLE t1 (b INT) ENGINE MYISAM
 DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/db1/';
+--enable_query_log
 
 INSERT INTO db2.t1 VALUES (1);
 SELECT * FROM db2.t1;