mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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.
This commit is contained in:
parent
fc17efc297
commit
58a77aafab
4 changed files with 7 additions and 4 deletions
4
debian/autobake-deb.sh
vendored
4
debian/autobake-deb.sh
vendored
|
@ -21,8 +21,8 @@ source ./VERSION
|
|||
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
|
||||
RELEASE_EXTRA=""
|
||||
|
||||
RELEASE_NAME=mariadb
|
||||
PATCHLEVEL=""
|
||||
RELEASE_NAME=""
|
||||
PATCHLEVEL="+maria"
|
||||
LOGSTRING="MariaDB build"
|
||||
|
||||
# Look up distro-version specific stuff.
|
||||
|
|
|
@ -4772,6 +4772,9 @@ sub extract_warning_lines ($$) {
|
|||
qr|Warning: io_setup\(\) failed|,
|
||||
qr|Warning: io_setup\(\) attempt|,
|
||||
qr|setrlimit could not change the size of core files to 'infinity';|,
|
||||
qr|feedback plugin: failed to retrieve the MAC address|,
|
||||
qr|Plugin 'FEEDBACK' init function returned error|,
|
||||
qr|Plugin 'FEEDBACK' registration as a INFORMATION SCHEMA failed|,
|
||||
);
|
||||
|
||||
my $matched_lines= [];
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -33,7 +33,7 @@ while ($1)
|
|||
ALTER TABLE t1 ENABLE KEYS;
|
||||
|
||||
--connection default
|
||||
--let $wait_timeout=10
|
||||
--let $wait_timeout=60
|
||||
--let $show_statement= SHOW PROCESSLIST
|
||||
--let $field= State
|
||||
--let $condition= = 'Repair by sorting'
|
||||
|
|
Loading…
Reference in a new issue