[Pkg-mysql-commits] r2055 - in mysql-5.5/branches/experimental/debian: . patches

[Nicholas Bamber]

tags 651003 pending
thanks

Author: periapt
Date: 2012-03-19 06:40:15 +0000 (Mon, 19 Mar 2012)
New Revision: 2055

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
   mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
   mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch
   mysql-5.5/branches/experimental/debian/rules
Log:
* Tweaked debian/rules to make build logs verbose (Closes: #651003)
* Refreshed patches

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-03-18 21:52:55 UTC (rev 2054)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-03-19 06:40:15 UTC (rev 2055)
@@ -44,6 +44,8 @@
     so that it works with that library (Closes: #660799)
   * Added patch to provide cmake options for GNU/Hurd (Closes: #651002)
     and tweaked debian/rules so that only 'make test' is run on Hurd.
+  * Tweaked debian/rules to make build logs verbose (Closes: #651003)
+  * Refreshed patches
 
  -- Clint Byrum <clint at ubuntu.com>  Tue, 14 Feb 2012 11:48:47 -0800
 

Modified: mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch	2012-03-18 21:52:55 UTC (rev 2054)
+++ mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch	2012-03-19 06:40:15 UTC (rev 2055)
@@ -2,10 +2,8 @@
 Subject: Executes /etc/init.d/mysql on signals
 Bug: http://bugs.mysql.com/bug.php?id=31361
 
-Index: mysql-5.5-sid/scripts/mysqld_safe.sh
-===================================================================
---- mysql-5.5-sid.orig/scripts/mysqld_safe.sh	2011-06-03 00:18:11.404604000 -0700
-+++ mysql-5.5-sid/scripts/mysqld_safe.sh	2011-06-03 00:53:07.785651661 -0700
+--- a/scripts/mysqld_safe.sh
++++ b/scripts/mysqld_safe.sh
 @@ -29,8 +29,6 @@
  syslog_tag_mysqld=mysqld
  syslog_tag_mysqld_safe=mysqld_safe
@@ -24,7 +22,7 @@
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -708,6 +706,13 @@
+@@ -711,6 +709,13 @@
  fi
  
  #

Modified: mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch	2012-03-18 21:52:55 UTC (rev 2054)
+++ mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch	2012-03-19 06:40:15 UTC (rev 2055)
@@ -1,8 +1,6 @@
-Index: mysql-5.5.17/mysql-test/t/disabled.def
-===================================================================
---- mysql-5.5.17.orig/mysql-test/t/disabled.def	2011-10-12 05:10:24.000000000 -0700
-+++ mysql-5.5.17/mysql-test/t/disabled.def	2011-11-08 12:05:58.830579964 -0800
-@@ -17,3 +17,5 @@
+--- a/mysql-test/t/disabled.def
++++ b/mysql-test/t/disabled.def
+@@ -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

Modified: mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch	2012-03-18 21:52:55 UTC (rev 2054)
+++ mysql-5.5/branches/experimental/debian/patches/71_disable_rpl_tests.patch	2012-03-19 06:40:15 UTC (rev 2055)
@@ -3,10 +3,8 @@
 Forwarded: no, not needed
 Description: disables test to allow build to pass while this is investigated.
 
-Index: mysql-5.5/mysql-test/suite/rpl/t/disabled.def
-===================================================================
---- mysql-5.5.orig/mysql-test/suite/rpl/t/disabled.def	2011-11-14 15:35:04.238715000 -0800
-+++ mysql-5.5/mysql-test/suite/rpl/t/disabled.def	2011-11-23 12:36:46.406356349 -0800
+--- 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

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2012-03-18 21:52:55 UTC (rev 2054)
+++ mysql-5.5/branches/experimental/debian/rules	2012-03-19 06:40:15 UTC (rev 2055)
@@ -84,7 +84,7 @@
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-		\
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		$(FORCE_FPIC) \
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 	       	-DMYSQL_USER=mysql \