[Pkg-mysql-commits] r2127 - in mysql-5.5/branches/unstable/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Wed May 30 05:38:35 UTC 2012
Author: periapt
Date: 2012-05-30 05:38:34 +0000 (Wed, 30 May 2012)
New Revision: 2127
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/patches/disable_rpl_tests.patch
mysql-5.5/branches/unstable/debian/patches/disable_tests.patch
mysql-5.5/branches/unstable/debian/patches/linked_list_mem_failure.patch
mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch
mysql-5.5/branches/unstable/debian/patches/series
mysql-5.5/branches/unstable/debian/rules
Log:
* Skipped certain SSL tests on i386 type architectures
pending investigation (cf. #674267)
* Removed main_openssl_1 patch
* Set SYSTEM_TYPE according to GNU Build System
* In an effort to get a better handle on test coverage, made test failures
on kfreebsd-i386 fatal and re-enabled full tests on hurd, skipped certain
tests on kfreebsd and changed disabled tests to selectively skipped tests
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-05-30 05:38:34 UTC (rev 2127)
@@ -2,7 +2,13 @@
* Fixing regular expression in tests to guard against build path containing
the '+' symbol (Closes: #674210)
- * Disabled certain SSL tests pending investigation (cf. #674267)
+ * Skipped certain SSL tests on i386 type architectures
+ pending investigation (cf. #674267)
+ * Removed main_openssl_1 patch
+ * Set SYSTEM_TYPE according to GNU Build System
+ * In an effort to get a better handle on test coverage, made test failures
+ on kfreebsd-i386 fatal and re-enabled full tests on hurd, skipped certain
+ tests on kfreebsd and changed disabled tests to selectively skipped tests
* Updated French translation (Closes: #674025)
* Updated Dutch translation (Closes: #674124)
* Updated Russian translation (Closes: #674189)
@@ -38,8 +44,6 @@
* Revert having libssl-dev as a build dependency and changed
WITH_SSL option to 'bundled' from 'yes' (Closes: #590905)
and (Closes: #673865)
- * Removed main_openssl_1 patch
- * Set SYSTEM_TYPE according to GNU Build System
-- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
Modified: mysql-5.5/branches/unstable/debian/patches/disable_rpl_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/disable_rpl_tests.patch 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/patches/disable_rpl_tests.patch 2012-05-30 05:38:34 UTC (rev 2127)
@@ -1,12 +1,24 @@
From: Clint Byrum <clint at ubuntu.com>
Bug-Ubuntu: http://pad.lv/894146
-Forwarded: no, not needed
-Description: disables test to allow build to pass while this is investigated.
-
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -15,3 +15,4 @@
- rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
- rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
-+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
+Forwarded: not needed
+Description: Skip on AMD64 builds
+Last-Update: 2012-05-29
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+--- /dev/null
++++ b/mysql-test/include/debian-fail-lp894146.inc
+@@ -0,0 +1,5 @@
++if (`select @@version_compile_machine in ('x86_64')`)
++{
++ skip Fails intermittently on AMD64 buildds http://pad.lv/894146;
++}
++
+--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
++++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+@@ -9,6 +9,7 @@
+ # * Various states of master and heartbeat
+ # * Circular replication
+ #############################################################
++--source include/debian-fail-lp894146.inc
+ --source include/master-slave.inc
+ #
+ # The test runs long and does not have any specifics to
Modified: mysql-5.5/branches/unstable/debian/patches/disable_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/disable_tests.patch 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/patches/disable_tests.patch 2012-05-30 05:38:34 UTC (rev 2127)
@@ -5,12 +5,9 @@
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
-@@ -15,3 +15,8 @@
+@@ -15,3 +15,5 @@
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
+partition_rename_longfilename : Fails when building with sbuild and schroots
+file_contents : Fails without bzr revision id
-+mysqlslap : n/a 2012-04-29 Failed once on kfreebsd
-+mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure
-+mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure
Modified: mysql-5.5/branches/unstable/debian/patches/linked_list_mem_failure.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/linked_list_mem_failure.patch 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/patches/linked_list_mem_failure.patch 2012-05-30 05:38:34 UTC (rev 2127)
@@ -1,22 +1,96 @@
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Subject: certain tests failing
Bug-Debian: http://bugs.debian.org/674267
-Last-Update: 2012-05-25
-Forwarded: no
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -17,3 +17,6 @@
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
- rpl_mysql_upgrade: Fails on Debian #64773
-+rpl_heartbeat_ssl: Debian Bug 674267 2012-05-24
-+rpl_ssl1: Debian Bug 674267 2012-05-24
-+rpl_ssl: Debian Bug 674267 2012-05-24
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
-@@ -29,3 +29,5 @@
- ssl_compress : Bug#64773 2012-03-27 Debian local
- ssl : Bug#64773 2012-03-27 Debian local
- openssl_1 : Bug#64773 2012-03-27 Debian local
-+ssl_cipher : Debian Bug 674267 2012-05-24
-+ssl_connect : Debian Bug 674267 2012-05-24
+Last-Update: 2012-05-27
+Forwarded: not-needed
+--- /dev/null
++++ b/mysql-test/include/debian-fail-674267.inc
+@@ -0,0 +1,5 @@
++if (`select @@version_compile_machine regexp 'i[3456]86' = 1`)
++{
++ skip See Debian bug #674267;
++}
++
+--- a/mysql-test/t/ssl_connect.test
++++ b/mysql-test/t/ssl_connect.test
+@@ -1,4 +1,5 @@
+
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+
+ # Repeat connect/disconnect
+--- a/mysql-test/t/ssl_cipher.test
++++ b/mysql-test/t/ssl_cipher.test
+@@ -1,5 +1,6 @@
+ # Turn on ssl between the client and server
+ # and run a number of tests
++-- source include/debian-fail-674267.inc
+
+ --echo #
+ --echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+--- a/mysql-test/suite/rpl/t/rpl_ssl.test
++++ b/mysql-test/suite/rpl/t/rpl_ssl.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-674267.inc
+ source include/have_ssl_communication.inc;
+ source include/master-slave.inc;
+
+--- a/mysql-test/suite/rpl/t/rpl_ssl1.test
++++ b/mysql-test/suite/rpl/t/rpl_ssl1.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-674267.inc
+ source include/have_ssl_communication.inc;
+ source include/master-slave.inc;
+
+--- a/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
++++ b/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
+@@ -3,6 +3,7 @@
+ # Date: 02/19/2009
+ # Purpose: Testing basic functionality of heartbeat over SSL
+ #############################################################
++-- source include/debian-fail-674267.inc
+ --source include/have_ssl_communication.inc
+ --source include/master-slave.inc
+ --echo
+--- a/mysql-test/t/openssl_1.test
++++ b/mysql-test/t/openssl_1.test
+@@ -1,6 +1,7 @@
+ # Tests for SSL connections, only run if mysqld is compiled
+ # with support for SSL.
+
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+
+ # Save the initial number of concurrent sessions
+--- a/mysql-test/t/ssl.test
++++ b/mysql-test/t/ssl.test
+@@ -1,6 +1,7 @@
+ # Turn on ssl between the client and server
+ # and run a number of tests
+
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+
+ # Save the initial number of concurrent sessions
+--- a/mysql-test/t/ssl_compress.test
++++ b/mysql-test/t/ssl_compress.test
+@@ -1,6 +1,7 @@
+ # Turn on compression between the client and server
+ # and run a number of tests
+
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+ -- source include/have_compress.inc
+
+--- a/mysql-test/t/ssl_8k_key.test
++++ b/mysql-test/t/ssl_8k_key.test
+@@ -2,6 +2,7 @@
+ #
+ # Bug#29784 YaSSL assertion failure when reading 8k key.
+ #
++-- source include/debian-fail-674267.inc
+ --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+
+ ## This test file is for testing encrypted communication only, not other
Modified: mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/patches/mysqlcheck_tests.patch 2012-05-30 05:38:34 UTC (rev 2127)
@@ -1,42 +1,97 @@
Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Bug: http://bugs.mysql.com/bug.php?id=64773
-Date: 2012-03-27
-Subject: Large number of bugs that suddenly started to fail.
- Have not been able to isolate the exact trigger.
- However several involve mysqlcheck failing to execute
- and that at least might be easy to investigate further.
- mysql-test-run of course starts the database, and forks off mysql_upgrade.
- The latter forks off mysqlcheck.
- Some of the other tests might be easily patchable by updating
- the expected test results - run ./mysql-test-run --record <test name>
- and copy the results file into the source mysql-test directory.
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
-@@ -20,3 +20,12 @@
- mysqlslap : n/a 2012-04-29 Failed once on kfreebsd
- mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure
- mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure
-+plugin_auth : Bug#64773 2012-03-27 Debian local
-+ssl_8k_key : Bug#64773 2012-03-27 Debian local
-+log_tables_upgrade : Bug#64773 2012-03-27 Debian local
-+mysql_upgrade : Bug#64773 2012-03-27 Debian local
-+mysql_upgrade_ssl : Bug#64773 2012-03-27 Debian local
-+mysqladmin : Bug#64773 2012-03-27 Debian local
-+ssl_compress : Bug#64773 2012-03-27 Debian local
-+ssl : Bug#64773 2012-03-27 Debian local
-+openssl_1 : Bug#64773 2012-03-27 Debian local
---- a/mysql-test/suite/perfschema/t/disabled.def
-+++ b/mysql-test/suite/perfschema/t/disabled.def
-@@ -9,4 +9,4 @@
- # Do not use any TAB characters for whitespace.
+Bug: http://bugs.mysql.com/bug.php?id=65288
+Date: 2012-05-28
+Subject: child process picking up external config files
+ The effect of the patch should be that the affected tests
+ run inside a clean chroot, but are skipped where stray
+ config files may upset the tests. These failed tests
+ are usually indicated by mysqlcheck triggering a FATAL ERROR.
+--- /dev/null
++++ b/mysql-test/include/debian-fail-local_my_cnf.inc
+@@ -0,0 +1,5 @@
++if ($FOUND_LOCAL_MY_CNF)
++{
++ skip See Oracle Bug#65288 (Debian);
++}
++
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -2462,6 +2462,17 @@
+ }
+
+ # ----------------------------------------------------
++ # found_local_my_cnf
++ # ----------------------------------------------------
++ my $found_local_my_cnf =
++ mtr_file_exists("~/.my.cnf") ||
++ mtr_file_exists("/etc/my.cnf") ||
++ mtr_file_exists("/etc/mysql/my.cnf");
++ if ($found_local_my_cnf) {
++ $ENV{'FOUND_LOCAL_MY_CNF'} = $found_local_my_cnf;
++ }
++
++ # ----------------------------------------------------
+ # perror
+ # ----------------------------------------------------
+ my $exe_perror= mtr_exe_exists(vs_config_dirs('extra', 'perror'),
+--- a/mysql-test/t/mysqladmin.test
++++ b/mysql-test/t/mysqladmin.test
+@@ -1,4 +1,5 @@
+ # Embedded server doesn't support external clients
++--source include/debian-fail-local_my_cnf.inc
+ --source include/not_embedded.inc
#
- ##############################################################################
--
-+pfs_upgrade: BUG#64773
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -16,3 +16,4 @@
- rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
-+rpl_mysql_upgrade: Fails on Debian #64773
+ # Test "mysqladmin ping"
+--- a/mysql-test/t/log_tables_upgrade.test
++++ b/mysql-test/t/log_tables_upgrade.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-local_my_cnf.inc
+ --source include/not_embedded.inc
+ --source include/have_csv.inc
+
+--- a/mysql-test/t/mysql_upgrade.test
++++ b/mysql-test/t/mysql_upgrade.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-local_my_cnf.inc
+ -- source include/mysql_upgrade_preparation.inc
+
+ #
+--- a/mysql-test/t/mysql_upgrade_ssl.test
++++ b/mysql-test/t/mysql_upgrade_ssl.test
+@@ -1,5 +1,6 @@
+ # mysql_upgrade tests requiring SSL support
+
++-- source include/debian-fail-local_my_cnf.inc
+ -- source include/have_ssl_communication.inc
+ -- source include/mysql_upgrade_preparation.inc
+
+--- a/mysql-test/t/plugin_auth.test
++++ b/mysql-test/t/plugin_auth.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-local_my_cnf.inc
+ --source include/have_plugin_auth.inc
+ --source include/not_embedded.inc
+ --source include/mysql_upgrade_preparation.inc
+--- a/mysql-test/suite/perfschema/t/pfs_upgrade.test
++++ b/mysql-test/suite/perfschema/t/pfs_upgrade.test
+@@ -3,6 +3,7 @@
+ # database.
+ #
+
++-- source include/debian-fail-local_my_cnf.inc
+ --source include/not_embedded.inc
+ --source include/have_perfschema.inc
+ --source include/have_lowercase0.inc
+--- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
++++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
+@@ -5,6 +5,7 @@
+ # options are added into mysql_upgrade. These options control whether sql
+ # statements are binlogged or not.
+ #############################################################################
++-- source include/debian-fail-local_my_cnf.inc
+ --source include/master-slave.inc
+
+ # Only run test if "mysql_upgrade" is found
Modified: mysql-5.5/branches/unstable/debian/patches/series
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/series 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/patches/series 2012-05-30 05:38:34 UTC (rev 2127)
@@ -11,3 +11,4 @@
hyphens-in-manpages.patch
regex_plus.patch
linked_list_mem_failure.patch
+kfreebsd_fails.patch
Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-05-28 16:24:32 UTC (rev 2126)
+++ mysql-5.5/branches/unstable/debian/rules 2012-05-30 05:38:34 UTC (rev 2127)
@@ -34,15 +34,10 @@
# before a release, but it is long
MAKE_TEST_TARGET:=test-bt
endif
-ifeq ($(ARCH_OS),hurd)
-# Tests not fully working under Hurd
-# See http://bugs.mysql.com/bug.php?id=64685
- MAKE_TEST_TARGET:=test
-endif
USE_ASSEMBLER:=--enable-assembler
-ifneq (,$(filter $(ARCH), amd64 i386))
+ifneq (,$(filter $(ARCH), amd64 i386 kfreebsd-i386))
TESTSUITE_FAIL_CMD:=exit 1
else
TESTSUITE_FAIL_CMD:=true
More information about the Pkg-mysql-commits
mailing list