summaryrefslogtreecommitdiff
path: root/debian/patches/fix-mysqldump-test.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/fix-mysqldump-test.patch')
-rw-r--r--debian/patches/fix-mysqldump-test.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/debian/patches/fix-mysqldump-test.patch b/debian/patches/fix-mysqldump-test.patch
deleted file mode 100644
index fd2c006..0000000
--- a/debian/patches/fix-mysqldump-test.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-+++ b/mysql-test/r/mysqldump.result
-@@ -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 */;
---- 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/
----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 ####
-