diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-04-16 09:42:09 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-04-16 09:42:09 +0200 |
| commit | 58a77aafab52bfc3d25bfd7680f8c27ca031e403 (patch) | |
| tree | 13010dd9b769158f817e32727d647b13fc90dc8a /mysql-test/suite/innodb/t | |
| parent | fc17efc29714b73a7b0bf806a354fa6fb294b35b (diff) | |
| download | mariadb-git-58a77aafab52bfc3d25bfd7680f8c27ca031e403.tar.gz | |
MDEV-3882: .deb versions lower than upstream repo, causing install failure
The official Debian Wheezy MySQL packages have versions like 5.5.30+dfsg-xxx.
Such version is larger than 5.5.30-yyy, so apt prefers it.
So use instead 5.5.30+maria-yyy, which is larger and can be pulled in
automatically by apt.
Also included are a couple of fixes for test failures in buildbot.
Diffstat (limited to 'mysql-test/suite/innodb/t')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug51920.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test index 0d4715712b0..c83e00db22a 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb/t/innodb_bug51920.test @@ -36,7 +36,7 @@ let $wait_condition = # depending on platform. # connection con1; --- error 1317, 2006, 2013 +-- error 1317, 2006, 2013, ER_CONNECTION_KILLED reap; connection default; DROP TABLE bug51920; |