diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
| commit | a5679af1b13bb0c7c4eaa75f27551072dc18fb7d (patch) | |
| tree | 7d039fb5e83c331daa75f9b9b67625b0469f6a9b /mysql-test/t/mysql_upgrade_view.test | |
| parent | 20c4dfd4a9e7c5f2f570488a7ead0b7c74e61817 (diff) | |
| parent | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff) | |
| download | mariadb-git-a5679af1b13bb0c7c4eaa75f27551072dc18fb7d.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/t/mysql_upgrade_view.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade_view.test | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade_view.test b/mysql-test/t/mysql_upgrade_view.test index 49a90264f11..7afe1ad250d 100644 --- a/mysql-test/t/mysql_upgrade_view.test +++ b/mysql-test/t/mysql_upgrade_view.test @@ -158,5 +158,30 @@ rename table mysql.ev_bk to mysql.event; drop table if exists kv; drop view v1,v2,v3,v4; -drop table t1; +# +# MDEV-9453 mysql_upgrade.exe error when mysql is migrated to mariadb +# (mysql_upgrade.exe --upgrade-system-tables fails on fixing views) +# + +# Make it look like a MySQL directory again + +rename table mysql.event to mysql.ev_bk; +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/event.MYI $MYSQLD_DATADIR/mysql/event.MYI +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/event.MYD $MYSQLD_DATADIR/mysql/event.MYD +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/event.frm $MYSQLD_DATADIR/mysql/event.frm + +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/v1.frm $MYSQLD_DATADIR/test/v1.frm +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/v2.frm $MYSQLD_DATADIR/test/v2.frm +--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/v3.frm $MYSQLD_DATADIR/test/v3.frm + +flush tables; + +--replace_result $MYSQLTEST_VARDIR var +--exec $MYSQL_UPGRADE --force --upgrade-system-tables 2>&1 + +# back to mariadb default +drop table mysql.event; +rename table mysql.ev_bk to mysql.event; +drop view v1,v2,v3; +drop table t1; |