diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-03-21 22:51:40 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-03-21 22:51:40 +0530 |
| commit | f735e50b626103b1f6d6d9daf93ca8c516219233 (patch) | |
| tree | e2ac7a849c51e7bd193ca985b2680ceb36f65e5c /mysql-test/t/mysql_upgrade.test | |
| parent | b6bd1998502ca53a33f0d28a9f5df0c5cbc0b5f1 (diff) | |
| download | mariadb-git-f735e50b626103b1f6d6d9daf93ca8c516219233.tar.gz | |
Bug#16500013 : ADD VERSION CHECK TO MYSQL_UPGRADE
(Based on Sinisa's patch)
Added a version checking facility to mysql_upgrade.
The versions used for checking is the version of the
server that mysql_upgrade is going to upgrade and the
server version that mysql_upgrade was build/distributed
with.
Also added an option '--version-check' to enable/disable
the version checking.
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 05b8c81a797..c52a328c28b 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -48,7 +48,9 @@ DROP USER mysqltest1@'%'; --replace_result $MYSQLTEST_VARDIR var --replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/ --error 1 ---exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1 +# NC: Added --skip-version-check, as the version check would fail when +# mysql_upgrade tries to get the server version. +--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host --skip-version-check 2>&1 # # Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE |