From: Date: November 1 2007 5:09pm Subject: bk commit into 5.1 tree (msvensson:1.2601) BUG#31004 List-Archive: http://lists.mysql.com/commits/36899 X-Bug: 31004 Message-Id: <20071101160955.F071130E9F0@pilot> Below is the list of changes that have just been committed into a local 5.1 repository of msvensson. When msvensson 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-01 17:09:49+01:00, msvensson@stripped +1 -0 Bug#31004 mysqltest needs a --mkdir command mysql-test/t/upgrade.test@stripped, 2007-11-01 17:09:44+01:00, msvensson@stripped +1 -6 Remove kludge in upgrade.test diff -Nrup a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test --- a/mysql-test/t/upgrade.test 2007-10-08 20:37:55 +02:00 +++ b/mysql-test/t/upgrade.test 2007-11-01 17:09:44 +01:00 @@ -1,10 +1,5 @@ -- source include/not_embedded.inc -# Temporary disabled on windows, -# because of --exec mkdir -# TODO: implement Bug#31004 and remove this limitation ---source include/not_windows.inc - --disable_warnings drop database if exists `mysqltest1`; drop database if exists `mysqltest-1`; @@ -75,7 +70,7 @@ create table tabc.t1 (a int); FLUSH TABLES; # Manually make a 5.0 database from the template ---exec mkdir $MYSQLTEST_VARDIR/master-data/a-b-c +--mkdir $MYSQLTEST_VARDIR/master-data/a-b-c --copy_file $MYSQLTEST_VARDIR/master-data/tabc/db.opt $MYSQLTEST_VARDIR/master-data/a-b-c/db.opt --copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.frm $MYSQLTEST_VARDIR/master-data/a-b-c/t1.frm --copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYD $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYD