Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package mariadb-10.0
This fixes 2 RC bugs. Here is the changelog entry and debdiff with
further explanations:
diff -Nru mariadb-10.0-10.0.14/debian/changelog
mariadb-10.0-10.0.14/debian/changelog
--- mariadb-10.0-10.0.14/debian/changelog 2014-10-22 05:49:56.000000000
+0900
+++ mariadb-10.0-10.0.14/debian/changelog 2014-11-14 11:11:44.000000000
+0900
@@ -1,3 +1,11 @@
+mariadb-10.0 (10.0.14-3) unstable; urgency=low
+
+ * Added patch d/username-in-tests-replace.patch to fix
+ test failure (Closes: #769212).
+ * Added versioned dependency on libpcre3 (Closes: #767903).
+
+ -- Otto Kekäläinen <o...@seravo.fi> Wed, 12 Nov 2014 15:00:11 +0300
+
mariadb-10.0 (10.0.14-2) unstable; urgency=low
[ Tobias Frost ]
diff -Nru mariadb-10.0-10.0.14/debian/control
mariadb-10.0-10.0.14/debian/control
--- mariadb-10.0-10.0.14/debian/control 2014-10-22 05:42:47.000000000
+0900
+++ mariadb-10.0-10.0.14/debian/control 2014-11-14 11:11:44.000000000
+0900
@@ -14,7 +14,7 @@
libjudy-dev,
libncurses5-dev (>= 5.0-6~),
libpam0g-dev,
- libpcre3-dev,
+ libpcre3-dev (>= 1:8.35),
libreadline-gplv2-dev,
libwrap0-dev (>= 7.6-8.3~),
lsb-release,
@@ -31,8 +31,7 @@
Architecture: any
Section: libdevel
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libmysqld-dev
Replaces: libmysqld-dev
Description: MariaDB embedded database development files
@@ -58,9 +57,7 @@
Package: mariadb-client-core-10.0
Architecture: any
-Depends: mariadb-common,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
Conflicts: mysql-client-5.5, mysql-client-5.6
Breaks: mariadb-client-core-5.5,
mysql-client-core-5.5,
diff -Nru mariadb-10.0-10.0.14/debian/patches/series
mariadb-10.0-10.0.14/debian/patches/series
--- mariadb-10.0-10.0.14/debian/patches/series 2014-10-03
06:46:10.000000000 +0900
+++ mariadb-10.0-10.0.14/debian/patches/series 2014-11-14
11:11:44.000000000 +0900
@@ -1,3 +1,4 @@
+username-in-tests-replace.patch
kfreebsd_tests.patch
disable-buggy-tokudb-tests.patch
scripts__mysql_create_system_tables__no_test.patch
diff -Nru mariadb-10.0-10.0.14/debian/patches/username-in-tests-replace.patch
mariadb-10.0-10.0.14/debian/patches/username-in-tests-replace.patch
--- mariadb-10.0-10.0.14/debian/patches/username-in-tests-replace.patch
1970-01-01 09:00:00.000000000 +0900
+++ mariadb-10.0-10.0.14/debian/patches/username-in-tests-replace.patch
2014-11-14 11:11:44.000000000 +0900
@@ -0,0 +1,72 @@
+Description: Closes #769212: mariadb-10.0: FTBFS in jessie: Tests failures
+ Reported a bug upstream and backported their fix that will also be included
+ in next upstream release (10.0.15). The root cause was the usage of username
+ 'user' on the Debian rebuilder, which wasn't a supported username until now.
+ .
+ MDEV-7089: Test failures in main.failed_auth_unixsocket and
plugins.unix_socket
+ depending on environment
+ .
+ The test cases had some --replace_result $USER USER. The problem is that the
+ value of $USER can be anything, depending on the name of the unix account
that
+ runs the test suite. So random parts of the result can be errorneously
+ replaced, causing test failures.
+ .
+ Fix by making the replacements more specific, so they will match only the
+ intended stuff regardless of the value of $USER.
+Author: Kristian Nielsen <knielsen at knielsen-hq.org>
+Bug: https://mariadb.atlassian.net/browse/MDEV-7089
+Last-Update: 2014-11-12
+
+=== modified file 'mysql-test/suite/plugins/t/unix_socket.test'
+--- a/mysql-test/suite/plugins/t/unix_socket.test 2014-03-16 18:21:37
+0000
++++ b/mysql-test/suite/plugins/t/unix_socket.test 2014-11-12 10:10:13
+0000
+@@ -12,11 +12,14 @@ eval install plugin unix_socket soname '
+ --echo # with named user
+ --echo #
+
+---replace_result $USER USER
++--let $replace=create user $USER
++--replace_result $replace "create user USER"
+ eval create user $USER identified via unix_socket;
+
+ --write_file $MYSQLTEST_VARDIR/tmp/peercred_test.txt
+---replace_result $USER USER
++--let $replace1=$USER at localhost
++--let $replace2=$USER@%
++--replace_result $replace1 "USER at localhost" $replace2 "USER@%"
+ select user(), current_user(), database();
+ EOF
+
+@@ -31,7 +34,8 @@ EOF
+ --error 1
+ --exec $MYSQL_TEST -u foobar --plugin-dir=$plugindir <
$MYSQLTEST_VARDIR/tmp/peercred_test.txt
+
+---replace_result $USER USER
++--let $replace=drop user $USER
++--replace_result $replace "drop user USER"
+ eval drop user $USER;
+
+ --echo #
+
+=== modified file 'mysql-test/t/failed_auth_unixsocket.test'
+--- a/mysql-test/t/failed_auth_unixsocket.test 2014-03-24 19:02:00
+0000
++++ b/mysql-test/t/failed_auth_unixsocket.test 2014-11-12 10:10:13
+0000
+@@ -16,11 +16,17 @@ change_user $USER;
+
+ eval install plugin unix_socket soname '$AUTH_SOCKET_SO';
+
+---replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
$USER USER
++# Make sure that the replace works, even if $USER is 'user' or something
else
++# that matches other parts of the error message.
++--echo connect(localhost,USER,,test,MASTER_PORT,MASTER_SOCKET);
++--let $replace=Access denied for user '$USER'
++--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
$replace "Access denied for user 'USER'"
++--disable_query_log
+ --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
+ connect (fail,localhost,$USER);
++--enable_query_log
+
+---replace_result $USER USER
++--replace_result $replace "Access denied for user 'USER'"
+ --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
+ change_user $USER;
Thanks in advance!
unblock mariadb-10.0/10.0.14-3
Regards,
--
Arnaud Fontaine
signature.asc
Description: PGP signature
