MDEV-25152: Insert linebreaks in mysqldump --extended-insert

Per review by Serg, include start row with new line.

We are hoping we haven't annoyed people that prefered the old
way.

Adding an option for new lines seems like over-engineering in advance.
So if there are complaints, let them be known (JIRA), and we'll add
this under an option.

Test cases updated.

1 files changed, 100 insertions, 50 deletions

diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index 6f61a60043c..eae0e1b03c6 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -37,7 +37,8 @@ CREATE TABLE `t1` (
   `a` decimal(64,20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1234567890123456789012345678901234567890.00000000000000000000),
+INSERT INTO `t1` VALUES
+(1234567890123456789012345678901234567890.00000000000000000000),
 (987654321098765432109876543210987654321.00000000000000000000);
 DROP TABLE t1;
 #
@@ -53,7 +54,8 @@ CREATE TABLE `t1` (
   `a` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (-1.7976931348623157e308);
+INSERT INTO `t1` VALUES
+(-1.7976931348623157e308);
 DROP TABLE t1;
 #
 # Bug#3361 mysqldump quotes DECIMAL values inconsistently
@@ -75,7 +77,8 @@ CREATE TABLE `t1` (
   `b` float DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1.23450,2.3456),
+INSERT INTO `t1` VALUES
+(1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
@@ -87,7 +90,8 @@ CREATE TABLE `t1` (
   `b` float DEFAULT NULL
 );
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1.23450,2.3456),
+INSERT INTO `t1` VALUES
+(1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
@@ -114,7 +118,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1.23450,2.3456),
+INSERT INTO `t1` VALUES
+(1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
@@ -145,7 +150,8 @@ CREATE TABLE `t1` (
 );
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-INSERT INTO `t1` VALUES (1.23450,2.3456),
+INSERT INTO `t1` VALUES
+(1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456),
@@ -265,7 +271,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (2);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -289,7 +296,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (2);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -553,7 +561,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('ÄÖÜß');
+INSERT INTO `t1` VALUES
+('ÄÖÜß');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -586,7 +595,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('����');
+INSERT INTO `t1` VALUES
+('����');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -609,7 +619,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('����');
+INSERT INTO `t1` VALUES
+('����');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -632,7 +643,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('ÄÖÜß');
+INSERT INTO `t1` VALUES
+('ÄÖÜß');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -671,7 +683,8 @@ CREATE TABLE `t2` (
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT INTO `t2` VALUES (4),
+INSERT INTO `t2` VALUES
+(4),
 (5),
 (6);
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
@@ -755,7 +768,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT  IGNORE INTO `t1` VALUES (1),
+INSERT  IGNORE INTO `t1` VALUES
+(1),
 (2),
 (3),
 (4),
@@ -793,7 +807,8 @@ CREATE TABLE `t1` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t1` VALUES (1),
+INSERT  DELAYED IGNORE INTO `t1` VALUES
+(1),
 (2),
 (3),
 (4),
@@ -1543,7 +1558,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (2),
 (3);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -1764,7 +1780,8 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (NULL),
+INSERT INTO `t1` VALUES
+(NULL),
 (10),
 (20);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -1772,7 +1789,8 @@ UNLOCK TABLES;
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT INTO `t2` VALUES (1,NULL,NULL,NULL,NULL,NULL),
+INSERT INTO `t2` VALUES
+(1,NULL,NULL,NULL,NULL,NULL),
 (2,10,NULL,NULL,NULL,NULL),
 (3,NULL,'twenty',NULL,NULL,NULL),
 (4,30,'thirty',NULL,NULL,NULL);
@@ -1808,7 +1826,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (NULL),
+INSERT INTO `t1` VALUES
+(NULL),
 (10),
 (20);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -1829,7 +1848,8 @@ CREATE TABLE `t2` (
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT INTO `t2` VALUES (1,NULL,NULL,NULL,NULL,NULL),
+INSERT INTO `t2` VALUES
+(1,NULL,NULL,NULL,NULL,NULL),
 (2,10,NULL,NULL,NULL,NULL),
 (3,NULL,'twenty',NULL,NULL,NULL),
 (4,30,'thirty',NULL,NULL,NULL);
@@ -2018,7 +2038,8 @@ CREATE TABLE "t1" (
 
 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
-INSERT INTO "t1" VALUES (815,4711,2006);
+INSERT INTO "t1" VALUES
+(815,4711,2006);
 /*!40000 ALTER TABLE "t1" ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -2052,7 +2073,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (815,4711,2006);
+INSERT INTO `t1` VALUES
+(815,4711,2006);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -2104,7 +2126,8 @@ CREATE TABLE `t2` (
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT INTO `t2` VALUES ('alfred'),
+INSERT INTO `t2` VALUES
+('alfred'),
 ('angie'),
 ('bingo'),
 ('waffle'),
@@ -2276,7 +2299,8 @@ CREATE TABLE `t2` (
 
 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT INTO `t2` VALUES ('alfred'),
+INSERT INTO `t2` VALUES
+('alfred'),
 ('angie'),
 ('bingo'),
 ('waffle'),
@@ -2346,7 +2370,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('\'');
+INSERT INTO `t1` VALUES
+('\'');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -2394,7 +2419,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1,2,'one'),
+INSERT INTO `t1` VALUES
+(1,2,'one'),
 (2,4,'two'),
 (3,6,'three');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -2554,7 +2580,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1,NULL),
+INSERT INTO `t1` VALUES
+(1,NULL),
 (2,NULL),
 (4,NULL),
 (11,NULL);
@@ -2686,7 +2713,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1,NULL),
+INSERT INTO `t1` VALUES
+(1,NULL),
 (2,NULL),
 (4,NULL),
 (11,NULL);
@@ -2835,7 +2863,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (2),
 (3),
 (4),
@@ -2991,7 +3020,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('2003-10-25 22:00:00'),
+INSERT INTO `t1` VALUES
+('2003-10-25 22:00:00'),
 ('2003-10-25 23:00:00');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -3029,7 +3059,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('2003-10-26 02:00:00'),
+INSERT INTO `t1` VALUES
+('2003-10-26 02:00:00'),
 ('2003-10-26 02:00:00');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -3082,7 +3113,8 @@ CREATE TABLE "t1 test" (
 
 LOCK TABLES "t1 test" WRITE;
 /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
-INSERT INTO "t1 test" VALUES (1),
+INSERT INTO "t1 test" VALUES
+(1),
 (2),
 (3);
 /*!40000 ALTER TABLE "t1 test" ENABLE KEYS */;
@@ -3113,7 +3145,8 @@ CREATE TABLE "t2 test" (
 
 LOCK TABLES "t2 test" WRITE;
 /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
-INSERT INTO "t2 test" VALUES (1),
+INSERT INTO "t2 test" VALUES
+(1),
 (2),
 (3);
 /*!40000 ALTER TABLE "t2 test" ENABLE KEYS */;
@@ -3171,7 +3204,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1,'first value','xxxx'),
+INSERT INTO `t1` VALUES
+(1,'first value','xxxx'),
 (2,'second value','tttt'),
 (3,'third value','vvv vvv');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
@@ -3397,7 +3431,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (0x00,'');
+INSERT INTO `t1` VALUES
+(0x00,'');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -3575,7 +3610,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1232131),
+INSERT INTO `t1` VALUES
+(1232131),
 (4711),
 (3231),
 (815);
@@ -3962,7 +3998,8 @@ CREATE TABLE `t1` (
   `c2` longblob DEFAULT NULL
 );
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
+INSERT INTO `t1` VALUES
+(11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
 DROP TABLE t1;
 #
 # Bug#28524 mysqldump --skip-add-drop-table is not
@@ -4195,7 +4232,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-REPLACE INTO `t1` VALUES (1,1),
+REPLACE INTO `t1` VALUES
+(1,1),
 (2,3),
 (3,4),
 (4,5);
@@ -4472,7 +4510,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (1232131),
+INSERT INTO `t1` VALUES
+(1232131),
 (4711),
 (3231),
 (815);
@@ -5567,7 +5606,8 @@ CREATE TABLE `basetable` (
   `id` smallint(6) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `basetable` VALUES (5),
+INSERT INTO `basetable` VALUES
+(5),
 (6);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5592,7 +5632,8 @@ CREATE TABLE `nonunique_table_name` (
   UNIQUE KEY `i1` (`i1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_name` VALUES (1),
+INSERT INTO `nonunique_table_name` VALUES
+(1),
 (2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5600,7 +5641,8 @@ CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_view_name` VALUES (3),
+INSERT INTO `nonunique_table_view_name` VALUES
+(3),
 (4);
 
 USE `db1`;
@@ -5630,7 +5672,8 @@ CREATE TABLE `nonunique_table_name` (
   UNIQUE KEY `i1` (`i1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_name` VALUES (1),
+INSERT INTO `nonunique_table_name` VALUES
+(1),
 (2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5638,7 +5681,8 @@ CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_view_name` VALUES (3),
+INSERT INTO `nonunique_table_view_name` VALUES
+(3),
 (4);
 
 ##################################################
@@ -5654,7 +5698,8 @@ CREATE TABLE `nonunique_table_name` (
   UNIQUE KEY `i1` (`i1`)
 ) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT  DELAYED INTO `nonunique_table_name` VALUES (1),
+INSERT  DELAYED INTO `nonunique_table_name` VALUES
+(1),
 (2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5662,7 +5707,8 @@ CREATE TABLE `nonunique_table_view_name` (
   `i2` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_view_name` VALUES (3),
+INSERT INTO `nonunique_table_view_name` VALUES
+(3),
 (4);
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */;
@@ -5674,7 +5720,8 @@ CREATE TABLE `basetable` (
   `id` smallint(6) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT  DELAYED INTO `basetable` VALUES (5),
+INSERT  DELAYED INTO `basetable` VALUES
+(5),
 (6);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -5682,7 +5729,8 @@ CREATE TABLE `nonunique_table_name` (
   `i3` smallint(6) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 INSERT_METHOD=LAST UNION=(`basetable`);
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `nonunique_table_name` VALUES (5),
+INSERT INTO `nonunique_table_name` VALUES
+(5),
 (6);
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
@@ -6158,7 +6206,8 @@ CREATE TABLE `t2` (
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t2` VALUES (1,2),
+INSERT INTO `t2` VALUES
+(1,2),
 (1,2);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -6178,7 +6227,8 @@ CREATE TABLE `t4` (
   `ËÏÌÏÎËÁ1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t4` VALUES (1);
+INSERT INTO `t4` VALUES
+(1);
 #Check side effect on --complete insert
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;