summaryrefslogtreecommitdiff
path: root/mysql-test/t/upgrade.test
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2007-11-01 17:09:49 +0100
committerunknown <msvensson@pilot.mysql.com>2007-11-01 17:09:49 +0100
commita574ce21fc627642e555b5d234b966a4e4332e48 (patch)
tree7f6a35fcca5db9a95fe5d3387e46d1348946c7c0 /mysql-test/t/upgrade.test
parent181f564bfa58e539bbcff16874016c5e1481a8e1 (diff)
downloadmariadb-git-a574ce21fc627642e555b5d234b966a4e4332e48.tar.gz
Bug#31004 mysqltest needs a --mkdir command
mysql-test/t/upgrade.test: Remove kludge in upgrade.test
Diffstat (limited to 'mysql-test/t/upgrade.test')
-rw-r--r--mysql-test/t/upgrade.test7
1 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
index 05f430b087b..ce40ec8ed77 100644
--- a/mysql-test/t/upgrade.test
+++ b/mysql-test/t/upgrade.test
@@ -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