diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/patches/fix-mysqldump-test.patch | 53 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 22 |
4 files changed, 77 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 204862a..b8b5b2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low * 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@periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100 diff --git a/debian/patches/fix-mysqldump-test.patch b/debian/patches/fix-mysqldump-test.patch new file mode 100644 index 0000000..7e53f14 --- /dev/null +++ b/debian/patches/fix-mysqldump-test.patch @@ -0,0 +1,53 @@ +Author: Clint Byrum <clint@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 #### + + diff --git a/debian/patches/series b/debian/patches/series index e07f7e2..cdf843f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ fix_standalone_tests.patch mysqlcheck_tests.patch kfreebsd_tests.patch spelling.patch +fix-mysqldump-test.patch diff --git a/debian/rules b/debian/rules index 4e0f059..07ca8d2 100755 --- a/debian/rules +++ b/debian/rules @@ -150,7 +150,6 @@ auto_install-stamp: # 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 @@ auto_install-stamp: 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 |