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

Mon May 14 06:22:21 UTC 2012

Author: periapt
Date: 2012-05-14 06:22:21 +0000 (Mon, 14 May 2012)
New Revision: 2104

Added:
   mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch
Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/patches/series
   mysql-5.5/branches/unstable/debian/rules
Log:
* Applied fix-mysqldump-test.patch from Ubuntu
* Added --fail-missing to dh_install to catch binaries not being installed

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================

--- mysql-5.5/branches/unstable/debian/changelog	2012-05-13 04:15:51 UTC (rev 2103)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-05-14 06:22:21 UTC (rev 2104)
@@ -11,6 +11,8 @@
   * Removed source cruft: debian/additions/mysql_config.1
   * Restored zlib1g-dev build dependency pending further investigation
   * Removed the numerical prefix from the patch files
+  * Applied fix-mysqldump-test.patch from Ubuntu
+  * Added --fail-missing to dh_install to catch binaries not being installed
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 

Added: mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/patches/fix-mysqldump-test.patch	2012-05-14 06:22:21 UTC (rev 2104)
@@ -0,0 +1,53 @@
+Author: Clint Byrum <clint at ubuntu.com>
+Description: Works around non-deterministic --verbose behavior in new
+ mysqldump test.
+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
+@@ -5118,12 +5118,6 @@
+ #        commit starting 5.5.
+ 
+ #### Dump starts here ####
+--- Connecting to localhost...
+--- main : logs flushed successfully!
+--- Starting transaction...
+--- Retrieving table structure for table t1...
+--- Sending SELECT query...
+--- Retrieving rows...
+ --
+ -- Host: localhost    Database: b12809202_db
+ -- ------------------------------------------------------
+@@ -5158,9 +5152,6 @@
+ LOCK TABLES `t1` WRITE;
+ /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+ INSERT INTO `t1` VALUES (1),(2),(3);
+--- Retrieving table structure for table t2...
+--- Sending SELECT query...
+--- Retrieving rows...
+ /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+ UNLOCK TABLES;
+ 
+@@ -5185,7 +5176,6 @@
+ INSERT INTO `t2` VALUES (1),(2),(3);
+ /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
+ UNLOCK TABLES;
+--- Disconnecting from localhost...
+ /*!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 @@
+ --echo
+ --echo #### Dump starts here ####
+ --replace_regex /-- Server version.*// /-- MySQL dump .*// /-- Dump completed on .*/-- Dump completed/
+---exec $MYSQL_DUMP --verbose --single-transaction --flush-log b12809202_db 2>&1
++--exec $MYSQL_DUMP --single-transaction --flush-log b12809202_db 2>&1
+ --echo
+ --echo #### Dump ends here ####
+ 
+

Modified: mysql-5.5/branches/unstable/debian/patches/series
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/series	2012-05-13 04:15:51 UTC (rev 2103)
+++ mysql-5.5/branches/unstable/debian/patches/series	2012-05-14 06:22:21 UTC (rev 2104)
@@ -8,3 +8,4 @@
 mysqlcheck_tests.patch
 kfreebsd_tests.patch
 spelling.patch
+fix-mysqldump-test.patch

Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules	2012-05-13 04:15:51 UTC (rev 2103)
+++ mysql-5.5/branches/unstable/debian/rules	2012-05-14 06:22:21 UTC (rev 2104)
@@ -150,7 +150,6 @@
 	# some self written manpages which hopefully
 	# gets overwritten sooner or later with upstreams
 	mkdir -p $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/usr/share/man/man8/
 	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
 	mkdir -p $(TMP)/etc/mysql/conf.d/
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
@@ -182,6 +181,27 @@
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 	touch $@
 
+# Use the --fail-missing to check for stuff that we should be installing
+# Exclusions:
+#       usr/share/man/  -       dh_installman
+#       libmysqlclient_r.so     dh_links
+#       usr/share/info          [dh_installinfo - mysql-client ]
+#       usr/share/mysql/magic   [dh_installexamples - mysql-server]
+#       usr/lib/mysql/plugin/daemon_example.ini [to investigate]
+#       usr/bin/mysqlaccess.conf [dh_installexamples - mysql-client]
+#       embdedded               [-> test suite ?]
+override_dh_install:
+	dh_install --fail-missing                       \
+        -Xusr/share/man/                                \
+        -Xlibmysqlclient_r.so                           \
+        -Xusr/share/info                                \
+        -Xusr/share/mysql/magic                         \
+        -Xusr/lib/mysql/plugin/daemon_example.ini       \
+        -Xusr/bin/mysqlaccess.conf                      \
+        -Xusr/bin/mysql_client_test_embedded            \
+        -Xusr/bin/mysql_embedded                        \
+        -Xusr/bin/mysqltest_embedded
+
 libmysqlclient-links-stamp: auto_install-stamp
 	@echo "RULES.$@"
 	# libmysqlclient_r is now a symlink to libmysqlclient. But it is


