diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
| commit | dd9119be20709267f7603c581ce53fbe9f96259c (patch) | |
| tree | 8414a0bf16f74515368a6a4ebc7ea528e8f982a2 /mysql-test/t/upgrade.test | |
| parent | 92e572e86c8a3c1c87f9c44565412ff966a96d97 (diff) | |
| parent | 1f18af1acb41c32680e57d64cd29053721d5e533 (diff) | |
| download | mariadb-git-dd9119be20709267f7603c581ce53fbe9f96259c.tar.gz | |
Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009)
Diffstat (limited to 'mysql-test/t/upgrade.test')
| -rw-r--r-- | mysql-test/t/upgrade.test | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test index ce40ec8ed77..a96d1f47cb2 100644 --- a/mysql-test/t/upgrade.test +++ b/mysql-test/t/upgrade.test @@ -52,7 +52,8 @@ drop table `txu#p#p1`; # Check if old tables work # -system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm; +let $MYSQLD_DATADIR= `select @@datadir`; +system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm $MYSQLD_DATADIR/test/t1.frm; truncate t1; drop table t1; @@ -70,11 +71,11 @@ create table tabc.t1 (a int); FLUSH TABLES; # Manually make a 5.0 database from the template ---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 ---copy_file $MYSQLTEST_VARDIR/master-data/tabc/t1.MYI $MYSQLTEST_VARDIR/master-data/a-b-c/t1.MYI +--mkdir $MYSQLD_DATADIR/a-b-c +--copy_file $MYSQLD_DATADIR/tabc/db.opt $MYSQLD_DATADIR/a-b-c/db.opt +--copy_file $MYSQLD_DATADIR/tabc/t1.frm $MYSQLD_DATADIR/a-b-c/t1.frm +--copy_file $MYSQLD_DATADIR/tabc/t1.MYD $MYSQLD_DATADIR/a-b-c/t1.MYD +--copy_file $MYSQLD_DATADIR/tabc/t1.MYI $MYSQLD_DATADIR/a-b-c/t1.MYI show databases like '%a-b-c%'; ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME; |