Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~stewart/percona-server/bug959198 into lp:percona-server/5.5

  1. bug959198
  2. Merge into 5.5
Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 359
Proposed branch: lp:~stewart/percona-server/bug959198
Merge into: lp:percona-server/5.5
Diff against target: 97 lines (+3/-70)
2 files modified
Percona-Server/mysql-test/r/mysqldump.result (+1/-69)
Percona-Server/mysql-test/t/mysqldump.test (+2/-1)
To merge this branch: bzr merge lp:~stewart/percona-server/bug959198
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+136569@code.launchpad.net

Description of the change

fixes sporadic failure of mysqldump test case.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/589/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/mysql-test/r/mysqldump.result'
--- Percona-Server/mysql-test/r/mysqldump.result 2012-09-17 13:08:32 +0000
+++ Percona-Server/mysql-test/r/mysqldump.result 2012-11-28 05:18:26 +0000
@@ -5124,79 +5124,11 @@
5124-- Retrieving table structure for table t1...5124-- Retrieving table structure for table t1...
5125-- Sending SELECT query...5125-- Sending SELECT query...
5126-- Retrieving rows...5126-- Retrieving rows...
5127--
5128-- Host: localhost Database: b12809202_db
5129-- ------------------------------------------------------
5130
5131/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
5132/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
5133/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
5134/*!40101 SET NAMES utf8 */;
5135/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
5136/*!40103 SET TIME_ZONE='+00:00' */;
5137/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
5138/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
5139/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
5140/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
5141
5142--
5143-- Table structure for table `t1`
5144--
5145
5146DROP TABLE IF EXISTS `t1`;
5147/*!40101 SET @saved_cs_client = @@character_set_client */;
5148/*!40101 SET character_set_client = utf8 */;
5149CREATE TABLE `t1` (
5150 `c1` int(11) DEFAULT NULL
5151) ENGINE=MyISAM DEFAULT CHARSET=latin1;
5152/*!40101 SET character_set_client = @saved_cs_client */;
5153
5154--
5155-- Dumping data for table `t1`
5156--
5157
5158LOCK TABLES `t1` WRITE;
5159/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
5160INSERT INTO `t1` VALUES (1),(2),(3);
5161-- Retrieving table structure for table t2...5127-- Retrieving table structure for table t2...
5162-- Sending SELECT query...5128-- Sending SELECT query...
5163-- Retrieving rows...5129-- Retrieving rows...
5164/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
5165UNLOCK TABLES;
5166
5167--
5168-- Table structure for table `t2`
5169--
5170
5171DROP TABLE IF EXISTS `t2`;
5172/*!40101 SET @saved_cs_client = @@character_set_client */;
5173/*!40101 SET character_set_client = utf8 */;
5174CREATE TABLE `t2` (
5175 `c1` int(11) DEFAULT NULL
5176) ENGINE=MyISAM DEFAULT CHARSET=latin1;
5177/*!40101 SET character_set_client = @saved_cs_client */;
5178
5179--
5180-- Dumping data for table `t2`
5181--
5182
5183LOCK TABLES `t2` WRITE;
5184/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
5185INSERT INTO `t2` VALUES (1),(2),(3);
5186/*!40000 ALTER TABLE `t2` ENABLE KEYS */;
5187UNLOCK TABLES;
5188-- Disconnecting from localhost...5130-- Disconnecting from localhost...
5189/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;5131
5190
5191/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
5192/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
5193/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
5194/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
5195/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
5196/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
5197/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
5198
5199-- Dump completed
5200#### Dump ends here ####5132#### Dump ends here ####
5201DROP TABLE b12809202_db.t1;5133DROP TABLE b12809202_db.t1;
5202DROP TABLE b12809202_db.t2;5134DROP TABLE b12809202_db.t2;
52035135
=== modified file 'Percona-Server/mysql-test/t/mysqldump.test'
--- Percona-Server/mysql-test/t/mysqldump.test 2012-05-09 14:08:44 +0000
+++ Percona-Server/mysql-test/t/mysqldump.test 2012-11-28 05:18:26 +0000
@@ -2351,7 +2351,8 @@
2351--echo2351--echo
2352--echo #### Dump starts here ####2352--echo #### Dump starts here ####
2353--replace_regex /-- Server version.*// /-- MySQL dump .*// /-- Dump completed on .*/-- Dump completed/2353--replace_regex /-- Server version.*// /-- MySQL dump .*// /-- Dump completed on .*/-- Dump completed/
2354--exec $MYSQL_DUMP --verbose --single-transaction --flush-log b12809202_db 2>&12354--exec $MYSQL_DUMP --verbose --single-transaction --flush-log b12809202_db --result-file $MYSQLTEST_VARDIR/tmp/stfl.sql 2>&1
2355--remove_file $MYSQLTEST_VARDIR/tmp/stfl.sql
2355--echo2356--echo
2356--echo #### Dump ends here ####2357--echo #### Dump ends here ####
23572358

Subscribers

People subscribed via source and target branches