diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
| commit | cb5952b5060d089c021808fe1f1cf13f7eb88423 (patch) | |
| tree | 1e4678bd3b899428428b4f7980b92fade8e57f62 /mysql-test/t/bootstrap.test | |
| parent | 57cde8ccd19675dc98e3cbacf0ef5c72cb188e49 (diff) | |
| parent | 9fbe360e9f7d41d169eb5abed22dc15f26f6c749 (diff) | |
| download | mariadb-git-cb5952b5060d089c021808fe1f1cf13f7eb88423.tar.gz | |
Merge branch '10.0' into bb-10.1-merge-sanja
Diffstat (limited to 'mysql-test/t/bootstrap.test')
| -rw-r--r-- | mysql-test/t/bootstrap.test | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test index d1a597a535e..8508c6c9dc6 100644 --- a/mysql-test/t/bootstrap.test +++ b/mysql-test/t/bootstrap.test @@ -106,3 +106,12 @@ use test; EOF --exec $MYSQLD_BOOTSTRAP_CMD --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 --remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql + +# +# MDEV-13397 MariaDB upgrade fail when using default_time_zone +# +--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql +use test; +EOF +--exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 +--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql |