bk commit into 5.1 tree (anozdrin:1.2564)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik 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-27 21:06:50+04:00, anozdrin@ibm. +2 -0
  Fix test so that it will be environment-independent.

  mysql-test/r/mysqldump.result@stripped, 2007-07-27 21:06:48+04:00, anozdrin@ibm. +2 -2
    Update result file.

  mysql-test/t/mysqldump.test@stripped, 2007-07-27 21:06:48+04:00, anozdrin@ibm. +2 -3
    Fix test so that it will be environment-independent.

diff -Nrup a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
--- a/mysql-test/r/mysqldump.result	2007-07-27 18:20:15 +04:00
+++ b/mysql-test/r/mysqldump.result	2007-07-27 21:06:48 +04:00
@@ -3952,12 +3952,12 @@ CREATE VIEW mysqldump_test_db.v2 AS SELE
 set names latin1;
 
-# Dump mysqldump_test_db to /dev/shm/t1/var/tmp/bug30027.sql.
+# Dump mysqldump_test_db to bug30027.sql.
 
 # Drop mysqldump_test_db.
 DROP DATABASE mysqldump_test_db;
 
-# Restore mysqldump_test_db from /dev/shm/t1/var/tmp/bug30027.sql.
+# Restore mysqldump_test_db from bug30027.sql.
 
 # Check the view.
 set names utf8;
diff -Nrup a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/mysqldump.test	2007-07-27 18:20:15 +04:00
+++ b/mysql-test/t/mysqldump.test	2007-07-27 21:06:48 +04:00
@@ -1702,10 +1702,9 @@ CREATE VIEW mysqldump_test_db.v1 AS SELE
 set names latin1;
 
 --echo
---echo # Dump mysqldump_test_db to $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+--echo # Dump mysqldump_test_db to bug30027.sql.
 
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --default-character-set=latin1 --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
-# --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql
 
 --echo
 --echo # Drop mysqldump_test_db.
@@ -1713,7 +1712,7 @@ set names latin1;
 DROP DATABASE mysqldump_test_db;
 
 --echo
---echo # Restore mysqldump_test_db from $MYSQLTEST_VARDIR/tmp/bug30027.sql.
+--echo # Restore mysqldump_test_db from bug30027.sql.
 
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30027.sql