diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
| commit | 38e3ae155db08ab2e9e5c267f05f89bec0542b33 (patch) | |
| tree | 7289bbef1ba3f495aa5c7cdb7d0a3f993a5bbc80 /mysql-test/t/mysql_upgrade.test | |
| parent | c56483d972d023105fbcb0f47af0042ee092657c (diff) | |
| parent | ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (diff) | |
| download | mariadb-git-38e3ae155db08ab2e9e5c267f05f89bec0542b33.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 4c188ff3147..f200bce551f 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -105,3 +105,22 @@ DROP USER 'user3'@'%'; --replace_result $MYSQLTEST_VARDIR var --exec $MYSQL_UPGRADE --force --upgrade-system-tables +--echo # +--echo # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION +--echo # SKIP-WRITE-BINLOG +--echo # + +let $MYSQLD_DATADIR= `select @@datadir`; + +--echo # Droping the previously created mysql_upgrade_info file.. +--remove_file $MYSQLD_DATADIR/mysql_upgrade_info + +--echo # Running mysql_upgrade with --skip-write-binlog.. +--replace_result $MYSQLTEST_VARDIR var +--exec $MYSQL_UPGRADE --skip-write-binlog + +# mysql_upgrade must have created mysql_upgrade_info file, +# so the following command should never fail. +--remove_file $MYSQLD_DATADIR/mysql_upgrade_info + +--echo End of tests |