Bug#14463669 FAILURE TO CORRECTLY PARSE ROUTINES IN
MYSQLDUMP OUTPUT A patch is pushed on this bug. A result mismatch occured for the test main.ddl_i18n_utf8 in x86_64 gcov build of linux in pb2. This commit is to modify ddl_i18n_utf8.result to match the changes made for the bug.
This commit is contained in:
parent
155b766d98
commit
21345a6aa8
@ -734,7 +734,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
|
||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||
/*!50003 SET sql_mode = '' */ ;
|
||||
DELIMITER ;;
|
||||
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`(
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
|
||||
INOUT парам1 CHAR(10),
|
||||
OUT парам2 CHAR(10))
|
||||
BEGIN
|
||||
@ -751,7 +751,7 @@ COLLATION(_koi8r '
|
||||
@@character_set_client AS c8;
|
||||
SET парам1 = 'a';
|
||||
SET парам2 = 'b';
|
||||
END */;;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||
@ -768,7 +768,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
|
||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||
/*!50003 SET sql_mode = '' */ ;
|
||||
DELIMITER ;;
|
||||
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`(
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
|
||||
INOUT парам1 CHAR(10) CHARACTER SET utf8,
|
||||
OUT парам2 CHAR(10) CHARACTER SET utf8)
|
||||
BEGIN
|
||||
@ -785,7 +785,7 @@ COLLATION(_koi8r '
|
||||
@@character_set_client AS c8;
|
||||
SET парам1 = 'a';
|
||||
SET парам2 = 'b';
|
||||
END */;;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||
@ -810,7 +810,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
|
||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||
/*!50003 SET sql_mode = '' */ ;
|
||||
DELIMITER ;;
|
||||
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`(
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
|
||||
INOUT парам1 CHAR(10),
|
||||
OUT парам2 CHAR(10))
|
||||
BEGIN
|
||||
@ -827,7 +827,7 @@ COLLATION(_koi8r '
|
||||
@@character_set_client AS c8;
|
||||
SET парам1 = 'a';
|
||||
SET парам2 = 'b';
|
||||
END */;;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||
@ -844,7 +844,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
|
||||
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
|
||||
/*!50003 SET sql_mode = '' */ ;
|
||||
DELIMITER ;;
|
||||
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`(
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
|
||||
INOUT парам1 CHAR(10) CHARACTER SET utf8,
|
||||
OUT парам2 CHAR(10) CHARACTER SET utf8)
|
||||
BEGIN
|
||||
@ -861,7 +861,7 @@ COLLATION(_koi8r '
|
||||
@@character_set_client AS c8;
|
||||
SET парам1 = 'a';
|
||||
SET парам2 = 'b';
|
||||
END */;;
|
||||
END ;;
|
||||
DELIMITER ;
|
||||
/*!50003 SET sql_mode = @saved_sql_mode */ ;
|
||||
/*!50003 SET character_set_client = @saved_cs_client */ ;
|
||||
|
Loading…
x
Reference in New Issue
Block a user