diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | b1e00b6be81c80b09d11085d77d86978e26df988 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /mysql-test/t/mysql_upgrade.test | |
| parent | 1f683a7270e63abfadce20c6f51370621ff065e1 (diff) | |
| parent | c9cfd2df5f2f58c2cdf716999ebea252c307333f (diff) | |
| download | mariadb-git-b1e00b6be81c80b09d11085d77d86978e26df988.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.
Still two test failures to be solved: main.myisam and main.subselect.
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 87457c36382..485302600c1 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -33,7 +33,7 @@ if (`SELECT $VALGRIND_TEST`) # expected binaries it uses. # --echo Run mysql_upgrade once ---exec $MYSQL_UPGRADE --skip-verbose 2>&1 +--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1 # It should have created a file in the MySQL Servers datadir let $MYSQLD_DATADIR= `select @@datadir`; |