Bug #23072245 MYSQLPUMP OUTPUT FAILS TO LOAD WHEN IT INCLUDES TRIGGERS

Problem: If trigger is defined with multiple statements in trigger body,
then during restore we get a sytax error. This patch fixes this issue by
enclosing the trigger ddl in a delimiter.

Author: Bharathy Satish

client/dump/mysql_crawler.cc

@@ -400,10 +400,10 @@ void Mysql_crawler::enumerate_table_triggers(
     const Mysql::Tools::Base::Mysql_query_runner::Row& trigger_row= **it;
     Trigger* trigger= new Trigger(this->generate_new_object_id(),
       trigger_row[0], table.get_schema(),
-      this->get_version_specific_statement(
+      "DELIMITER //\n" + this->get_version_specific_statement(
       this->get_create_statement(
       runner, table.get_schema(), trigger_row[0], "TRIGGER", 2).value(),
-      "TRIGGER", "50017", "50003"),
+      "TRIGGER", "50017", "50003") + "\n//\n" + "DELIMITER ;\n",
       &table);
 
     trigger->add_dependency(dependency);

mysql-test/r/mysqlpump_basic.result

@@ -627,3 +627,33 @@ part1_hash
 part2_hash
 part3_hash
 DROP DATABASE bug22726732;
+CREATE DATABASE bug23072245;
+USE bug23072245;
+CREATE TABLE test1(a1 INT);
+CREATE TABLE test2(a2 INT);
+CREATE TABLE test3(a3 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+CREATE TABLE test4(a4 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b4 INT DEFAULT 0);
+CREATE TRIGGER testref BEFORE INSERT ON test1
+FOR EACH ROW
+BEGIN
+INSERT INTO test2 SET a2 = NEW.a1;
+DELETE FROM test3 WHERE a3 = NEW.a1;
+UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;
+END ;|
+SHOW TRIGGERS;
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+testref	INSERT	test1	BEGIN
+INSERT INTO test2 SET a2 = NEW.a1;
+DELETE FROM test3 WHERE a3 = NEW.a1;
+UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;
+END	BEFORE	0000-00-00 00:00:00	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP DATABASE bug23072245;
+USE bug23072245;
+SHOW TRIGGERS;
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+testref	INSERT	test1	BEGIN
+INSERT INTO test2 SET a2 = NEW.a1;
+DELETE FROM test3 WHERE a3 = NEW.a1;
+UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;
+END	BEFORE	0000-00-00 00:00:00	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8mb4	utf8mb4_general_ci	latin1_swedish_ci
+DROP DATABASE bug23072245;

mysql-test/t/mysqlpump_basic.test

@@ -536,3 +536,34 @@ DROP DATABASE bug22726732;
 USE bug22726732;
 SHOW TABLES;
 DROP DATABASE bug22726732;
+
+#echo
+#echo Bug #23072245 MYSQLPUMP OUTPUT FAILS TO LOAD WHEN IT INCLUDES TRIGGERS
+#echo
+
+CREATE DATABASE bug23072245;
+USE bug23072245;
+CREATE TABLE test1(a1 INT);
+CREATE TABLE test2(a2 INT);
+CREATE TABLE test3(a3 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
+CREATE TABLE test4(a4 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b4 INT DEFAULT 0);
+DELIMITER |;
+CREATE TRIGGER testref BEFORE INSERT ON test1
+FOR EACH ROW
+BEGIN
+ INSERT INTO test2 SET a2 = NEW.a1;
+ DELETE FROM test3 WHERE a3 = NEW.a1;
+ UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;
+END ;|
+DELIMITER ;|
+--replace_column 6 '0000-00-00 00:00:00'
+SHOW TRIGGERS;
+
+--exec $MYSQL_PUMP --databases bug23072245 > $MYSQLTEST_VARDIR/tmp/bug23072245.sql
+DROP DATABASE bug23072245;
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug23072245.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/bug23072245.sql
+USE bug23072245;
+--replace_column 6 '0000-00-00 00:00:00'
+SHOW TRIGGERS;
+DROP DATABASE bug23072245;