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.

client/mysqldump.c

@@ -3412,9 +3412,10 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
       }
       else
       {
-        dynstr_append_checked(&insert_pat, " VALUES ");
-        if (!extended_insert)
-          dynstr_append_checked(&insert_pat, "(");
+        if (extended_insert)
+          dynstr_append_checked(&insert_pat, " VALUES\n");
+        else
+          dynstr_append_checked(&insert_pat, " VALUES (");
       }
     }
 

mysql-test/main/ddl_i18n_koi8r.result

@@ -1739,7 +1739,8 @@ CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (0),
 (1);
 ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
@@ -1820,7 +1821,8 @@ CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (0),
 (1);
 ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;

mysql-test/main/ddl_i18n_utf8.result

@@ -1739,7 +1739,8 @@ CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (0),
 (1);
 ALTER DATABASE `mysqltest1` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;
@@ -1820,7 +1821,8 @@ CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),
+INSERT INTO `t1` VALUES
+(1),
 (0),
 (1);
 ALTER DATABASE `mysqltest2` CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci ;

mysql-test/main/mysql.result

@@ -558,7 +558,8 @@ CREATE TABLE `a1\``b1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `a1\``b1` VALUES (1),
+INSERT INTO `a1\``b1` VALUES
+(1),
 (2);
 insert `a1\``b1` values (4),(5);
 show create table `a1\``b1`;
@@ -588,7 +589,8 @@ CREATE TABLE "a1\""b1" (
   "a" int(11) DEFAULT NULL
 );
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO "a1\""b1" VALUES (1),
+INSERT INTO "a1\""b1" VALUES
+(1),
 (2);
 insert "a1\""b1" values (4),(5);
 show create table "a1\""b1";
@@ -605,11 +607,11 @@ set sql_mode=default;
 create table t1 (a text);
 select count(*) from t1;
 count(*)
-42
+43
 truncate table t1;
 select count(*) from t1;
 count(*)
-42
+43
 truncate table t1;
 select count(*) from t1;
 count(*)
@@ -621,7 +623,7 @@ count(*)
 truncate table t1;
 select count(*) from t1;
 count(*)
-42
+43
 truncate table t1;
 select count(*) from t1;
 count(*)

mysql-test/main/mysqldump-max.result

@@ -102,7 +102,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,'first value'),
+INSERT  DELAYED IGNORE INTO `t1` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -118,7 +119,8 @@ CREATE TABLE `t2` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t2` VALUES (1,'first value'),
+INSERT  DELAYED IGNORE INTO `t2` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -134,7 +136,8 @@ CREATE TABLE `t3` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t3` VALUES (1,'first value'),
+INSERT  DELAYED IGNORE INTO `t3` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -150,7 +153,8 @@ CREATE TABLE `t4` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t4` VALUES (1,'first value'),
+INSERT  DELAYED IGNORE INTO `t4` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -166,7 +170,8 @@ CREATE TABLE `t5` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
-INSERT  DELAYED IGNORE INTO `t5` VALUES (1,'first value'),
+INSERT  DELAYED IGNORE INTO `t5` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -182,7 +187,8 @@ CREATE TABLE `t6` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
-INSERT  IGNORE INTO `t6` VALUES (1,'first value'),
+INSERT  IGNORE INTO `t6` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -223,7 +229,8 @@ CREATE TABLE `t1` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT  DELAYED INTO `t1` VALUES (1,'first value'),
+INSERT  DELAYED INTO `t1` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -239,7 +246,8 @@ CREATE TABLE `t2` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
-INSERT  DELAYED INTO `t2` VALUES (1,'first value'),
+INSERT  DELAYED INTO `t2` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -255,7 +263,8 @@ CREATE TABLE `t3` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
-INSERT  DELAYED INTO `t3` VALUES (1,'first value'),
+INSERT  DELAYED INTO `t3` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -271,7 +280,8 @@ CREATE TABLE `t4` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
-INSERT  DELAYED INTO `t4` VALUES (1,'first value'),
+INSERT  DELAYED INTO `t4` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -287,7 +297,8 @@ CREATE TABLE `t5` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
-INSERT  DELAYED INTO `t5` VALUES (1,'first value'),
+INSERT  DELAYED INTO `t5` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),
@@ -303,7 +314,8 @@ CREATE TABLE `t6` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
-INSERT INTO `t6` VALUES (1,'first value'),
+INSERT INTO `t6` VALUES
+(1,'first value'),
 (2,'first value'),
 (3,'first value'),
 (4,'first value'),

mysql-test/main/mysqldump-utf8mb4.result

@@ -56,7 +56,8 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES ('01f300','🌀','U+1F300 CYCLONE');
+INSERT INTO `t1` VALUES
+('01f300','🌀','U+1F300 CYCLONE');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

mysql-test/main/openssl_1.result

@@ -98,7 +98,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;
@@ -133,7 +134,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;
@@ -168,7 +170,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;

mysql-test/suite/roles/definer.result

@@ -326,7 +326,9 @@ CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1,10,100),(2,20,200);
+INSERT INTO `t1` VALUES
+(1,10,100),
+(2,20,200);
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t2` (
@@ -335,7 +337,8 @@ CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t2` VALUES (2,20,200);
+INSERT INTO `t2` VALUES
+(2,20,200);
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;

mysql-test/suite/sql_sequence/mysqldump.result

@@ -14,7 +14,9 @@ CREATE TABLE `t1` (
   KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2);
+INSERT INTO `t1` VALUES
+(1),
+(2);
 # dump by tables order 1
 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
 SELECT SETVAL(`a1`, 1, 0);
@@ -27,7 +29,9 @@ CREATE TABLE `t1` (
   KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2);
+INSERT INTO `t1` VALUES
+(1),
+(2);
 # dump by tables order 2
 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
 SELECT SETVAL(`a1`, 1, 0);
@@ -40,7 +44,9 @@ CREATE TABLE `t1` (
   KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2);
+INSERT INTO `t1` VALUES
+(1),
+(2);
 # dump by tables only tables
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -49,7 +55,9 @@ CREATE TABLE `t1` (
   KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1024;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2);
+INSERT INTO `t1` VALUES
+(1),
+(2);
 # dump by tables only sequences
 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
 SELECT SETVAL(`a1`, 1, 0);

mysql-test/suite/versioning/r/data.result

@@ -16,7 +16,8 @@ CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (3);
+INSERT INTO `t1` VALUES
+(3);
 #MYSQL_DUMP --compact --as-of="1990-01-02 00:00" test
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -24,7 +25,10 @@ CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2),(3);
+INSERT INTO `t1` VALUES
+(1),
+(2),
+(3);
 #MYSQL_DUMP --compact --as-of="1990-08-02 00:00" --databases test
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
@@ -36,7 +40,10 @@ CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (1),(2),(3);
+INSERT INTO `t1` VALUES
+(1),
+(2),
+(3);
 #MYSQL_DUMP --compact --as-of="1990-08-04 00:00" test t1
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -44,7 +51,9 @@ CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (2),(3);
+INSERT INTO `t1` VALUES
+(2),
+(3);
 #MYSQL_DUMP --compact --as-of="1990-08-04 00:00' where 'abc" test 2>&1
 mysqldump: Incorrect DATETIME value: '1990-08-04 00:00' where 'abc'
 drop tables t1;