MDEV-27816: Set sql_mode before DROP IF EXISTS already (postfix)
Test compat/oracle.sp-package-mysqldump needed re-record.
This commit is contained in:
parent
221ced92aa
commit
0db27eff27
@ -45,6 +45,8 @@ $$
|
|||||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
||||||
/*!50003 DROP PROCEDURE IF EXISTS `p1` */;
|
/*!50003 DROP PROCEDURE IF EXISTS `p1` */;
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
@ -52,8 +54,6 @@ $$
|
|||||||
/*!50003 SET character_set_client = latin1 */ ;
|
/*!50003 SET character_set_client = latin1 */ ;
|
||||||
/*!50003 SET character_set_results = latin1 */ ;
|
/*!50003 SET character_set_results = latin1 */ ;
|
||||||
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
CREATE DEFINER="root"@"localhost" PROCEDURE "p1"()
|
CREATE DEFINER="root"@"localhost" PROCEDURE "p1"()
|
||||||
AS
|
AS
|
||||||
@ -65,6 +65,8 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
||||||
/*!50003 DROP PACKAGE IF EXISTS `pkg1` */;
|
/*!50003 DROP PACKAGE IF EXISTS `pkg1` */;
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
@ -72,8 +74,6 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = latin1 */ ;
|
/*!50003 SET character_set_client = latin1 */ ;
|
||||||
/*!50003 SET character_set_results = latin1 */ ;
|
/*!50003 SET character_set_results = latin1 */ ;
|
||||||
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
CREATE DEFINER="root"@"localhost" PACKAGE "pkg1" AS
|
CREATE DEFINER="root"@"localhost" PACKAGE "pkg1" AS
|
||||||
PROCEDURE p1;
|
PROCEDURE p1;
|
||||||
@ -84,6 +84,8 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
||||||
/*!50003 DROP PACKAGE IF EXISTS `pkg2` */;
|
/*!50003 DROP PACKAGE IF EXISTS `pkg2` */;
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
@ -91,8 +93,6 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = latin1 */ ;
|
/*!50003 SET character_set_client = latin1 */ ;
|
||||||
/*!50003 SET character_set_results = latin1 */ ;
|
/*!50003 SET character_set_results = latin1 */ ;
|
||||||
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
CREATE DEFINER="root"@"localhost" PACKAGE "pkg2" AS
|
CREATE DEFINER="root"@"localhost" PACKAGE "pkg2" AS
|
||||||
PROCEDURE p1;
|
PROCEDURE p1;
|
||||||
@ -103,6 +103,8 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||||
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
/*!50003 SET character_set_results = @saved_cs_results */ ;
|
||||||
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
/*!50003 SET collation_connection = @saved_col_connection */ ;
|
||||||
|
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||||
|
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
||||||
/*!50003 DROP PACKAGE BODY IF EXISTS `pkg1` */;
|
/*!50003 DROP PACKAGE BODY IF EXISTS `pkg1` */;
|
||||||
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
|
||||||
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
|
||||||
@ -110,8 +112,6 @@ DELIMITER ;
|
|||||||
/*!50003 SET character_set_client = latin1 */ ;
|
/*!50003 SET character_set_client = latin1 */ ;
|
||||||
/*!50003 SET character_set_results = latin1 */ ;
|
/*!50003 SET character_set_results = latin1 */ ;
|
||||||
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
/*!50003 SET collation_connection = latin1_swedish_ci */ ;
|
||||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
|
||||||
/*!50003 SET sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT' */ ;
|
|
||||||
DELIMITER ;;
|
DELIMITER ;;
|
||||||
CREATE DEFINER="root"@"localhost" PACKAGE BODY "pkg1" AS
|
CREATE DEFINER="root"@"localhost" PACKAGE BODY "pkg1" AS
|
||||||
PROCEDURE p1 AS
|
PROCEDURE p1 AS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user