diff --git a/client/mysqldump.c b/client/mysqldump.c index c593af71ad9..ba47ba266ae 100644 --- a/client/mysqldump.c +++ b/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 ("); } } diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result index a755632d6f1..074fb4c6fd8 100644 --- a/mysql-test/main/ddl_i18n_koi8r.result +++ b/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 ; diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result index 3dab7dafdb7..53190dcc22e 100644 --- a/mysql-test/main/ddl_i18n_utf8.result +++ b/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 ; diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result index f2c3745cb23..70dde06600e 100644 --- a/mysql-test/main/mysql.result +++ b/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(*) diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result index cfef10ba0b4..2e131d46f9b 100644 --- a/mysql-test/main/mysqldump-max.result +++ b/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'), diff --git a/mysql-test/main/mysqldump-utf8mb4.result b/mysql-test/main/mysqldump-utf8mb4.result index 50c23c5efa9..904771302f8 100644 --- a/mysql-test/main/mysqldump-utf8mb4.result +++ b/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 */; 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 */; diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result index 52f64ab7f1f..a9264b3ed2c 100644 --- a/mysql-test/main/openssl_1.result +++ b/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; diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result index ecfa8113220..66c455625aa 100644 --- a/mysql-test/suite/roles/definer.result +++ b/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 */ ; diff --git a/mysql-test/suite/sql_sequence/mysqldump.result b/mysql-test/suite/sql_sequence/mysqldump.result index fb023cc5e36..7da48a917ca 100644 --- a/mysql-test/suite/sql_sequence/mysqldump.result +++ b/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); diff --git a/mysql-test/suite/versioning/r/data.result b/mysql-test/suite/versioning/r/data.result index c356da8f078..873f7297ad5 100644 --- a/mysql-test/suite/versioning/r/data.result +++ b/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;