mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-3882: .deb versions lower than upstream repo, causing install failure

Browse source 
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:
unknown 2013-04-16 09:42:09 +02:00
parent fc17efc297
commit 58a77aafab
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/autobake-deb.sh vendored
View file

@ -21,8 +21,8 @@ source ./VERSION
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
RELEASE_EXTRA="" RELEASE_EXTRA=""
RELEASE_NAME=mariadb RELEASE_NAME=""
PATCHLEVEL="" PATCHLEVEL="+maria"
LOGSTRING="MariaDB build" LOGSTRING="MariaDB build"
# Look up distro-version specific stuff. # Look up distro-version specific stuff.

3
mysql-test/mysql-test-run.pl
View file

@ -4772,6 +4772,9 @@ sub extract_warning_lines ($$) {
qr|Warning: io_setup\(\) failed|, qr|Warning: io_setup\(\) failed|,
qr|Warning: io_setup\(\) attempt|, qr|Warning: io_setup\(\) attempt|,
qr|setrlimit could not change the size of core files to 'infinity';|, 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= []; my $matched_lines= [];

2
mysql-test/suite/innodb/t/innodb_bug51920.test
View file

@ -36,7 +36,7 @@ let $wait_condition =
# depending on platform. # depending on platform.
# #
connection con1; connection con1;
-- error 1317, 2006, 2013 -- error 1317, 2006, 2013, ER_CONNECTION_KILLED
reap; reap;
connection default; connection default;
DROP TABLE bug51920; DROP TABLE bug51920;

2
mysql-test/t/myisam-metadata.test
View file

@ -33,7 +33,7 @@ while ($1)
ALTER TABLE t1 ENABLE KEYS; ALTER TABLE t1 ENABLE KEYS;
--connection default --connection default
--let $wait_timeout=10 --let $wait_timeout=60
--let $show_statement= SHOW PROCESSLIST --let $show_statement= SHOW PROCESSLIST
--let $field= State --let $field= State
--let $condition= = 'Repair by sorting' --let $condition= = 'Repair by sorting'