diff options
| author | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-06-06 08:16:28 +0000 |
|---|---|---|
| committer | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-06-06 08:16:28 +0000 |
| commit | 37f5824be5c186f95d616c467f51b3ce8d8f565e (patch) | |
| tree | d2bdeee9cc82ee17d41ad87e9f67921dba7b3f44 | |
| parent | 273129d019bae966c315b8b99b80bc543bd1c12c (diff) | |
| download | mysql-5.5-37f5824be5c186f95d616c467f51b3ce8d8f565e.tar.gz | |
new upstream source
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2140 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/disable_tests.patch | 3 | ||||
| -rw-r--r-- | debian/patches/fix-mysqldump-test.patch | 13 |
3 files changed, 8 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 11b6587..4858186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low +mysql-5.5 (5.5.25+dfsg-1) UNRELEASED; urgency=low * Fixing regular expression in tests to guard against build path containing the '+' symbol (Closes: #674210) diff --git a/debian/patches/disable_tests.patch b/debian/patches/disable_tests.patch index e7ccee4..740c8df 100644 --- a/debian/patches/disable_tests.patch +++ b/debian/patches/disable_tests.patch @@ -5,9 +5,10 @@ Last-Update: 2012-03-07 Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk> --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def -@@ -15,3 +15,5 @@ +@@ -15,3 +15,6 @@ 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 ++partition_binlog : Fails on Debian, looks easy to fix but not sure how diff --git a/debian/patches/fix-mysqldump-test.patch b/debian/patches/fix-mysqldump-test.patch index 7e53f14..fd2c006 100644 --- a/debian/patches/fix-mysqldump-test.patch +++ b/debian/patches/fix-mysqldump-test.patch @@ -4,8 +4,8 @@ Description: Works around non-deterministic --verbose behavior in new Bug: http://bugs.mysql.com/bug.php?id=64401 === modified file 'mysql-test/r/mysqldump.result' ---- a/mysql-test/r/mysqldump.result 2012-03-06 21:09:56 +0000 -+++ b/mysql-test/r/mysqldump.result 2012-03-08 07:07:04 +0000 +--- a/mysql-test/r/mysqldump.result ++++ b/mysql-test/r/mysqldump.result @@ -5118,12 +5118,6 @@ # commit starting 5.5. @@ -37,11 +37,9 @@ Bug: http://bugs.mysql.com/bug.php?id=64401 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; - -=== modified file 'mysql-test/t/mysqldump.test' ---- a/mysql-test/t/mysqldump.test 2012-03-06 21:09:56 +0000 -+++ b/mysql-test/t/mysqldump.test 2012-03-08 07:06:53 +0000 -@@ -2351,7 +2351,7 @@ +--- a/mysql-test/t/mysqldump.test ++++ b/mysql-test/t/mysqldump.test +@@ -2352,7 +2352,7 @@ --echo --echo #### Dump starts here #### --replace_regex /-- Server version.*// /-- MySQL dump .*// /-- Dump completed on .*/-- Dump completed/ @@ -50,4 +48,3 @@ Bug: http://bugs.mysql.com/bug.php?id=64401 --echo --echo #### Dump ends here #### - |