Author: Clint Byrum 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 ####