[Pkg-mysql-commits] r2140 - in mysql-5.5/branches/unstable/debian: . patches

[Nicholas Bamber]

Author: periapt
Date: 2012-06-06 08:16:28 +0000 (Wed, 06 Jun 2012)
New Revision: 2140

Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/patches/disable_tests.patch
   mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch
Log:
new upstream source

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2012-06-05 05:43:03 UTC (rev 2139)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-06-06 08:16:28 UTC (rev 2140)
@@ -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)

Modified: mysql-5.5/branches/unstable/debian/patches/disable_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/disable_tests.patch	2012-06-05 05:43:03 UTC (rev 2139)
+++ mysql-5.5/branches/unstable/debian/patches/disable_tests.patch	2012-06-06 08:16:28 UTC (rev 2140)
@@ -5,9 +5,10 @@
 Reviewed-by: Nicholas Bamber <nicholas at 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

Modified: mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch	2012-06-05 05:43:03 UTC (rev 2139)
+++ mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch	2012-06-06 08:16:28 UTC (rev 2140)
@@ -4,8 +4,8 @@
 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 @@
  /*!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 @@
  --echo
  --echo #### Dump ends here ####
  
-