5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-01 00:54:03 +01:00
commit 59d9d08e2b
304 changed files with 12471 additions and 940 deletions

View file

@ -171,6 +171,7 @@ Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${sourc
Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
Suggests: patch
Replaces: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
Description: MariaDB database regression test suite

View file

@ -162,6 +162,7 @@ Package: mariadb-test-5.5
Section: database
Architecture: any
Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
Suggests: patch
Conflicts: mariadb-test (<< ${source:Version}),
mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)