Commit c0157d16 authored by Vamsikrishna Bhagi's avatar Vamsikrishna Bhagi

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_koi8r in
x86_64 gcov build of linux in pb2. This commit is
to modify ddl_i18n_koi8r.result to match the
changes made for the bug.
parent f1e9b721
...@@ -734,7 +734,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ...@@ -734,7 +734,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = '' */ ; /*!50003 SET sql_mode = '' */ ;
DELIMITER ;; DELIMITER ;;
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p1`( CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
INOUT 1 CHAR(10), INOUT 1 CHAR(10),
OUT 2 CHAR(10)) OUT 2 CHAR(10))
BEGIN BEGIN
...@@ -751,7 +751,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6, ...@@ -751,7 +751,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6,
@@character_set_client AS c8; @@character_set_client AS c8;
SET 1 = 'a'; SET 1 = 'a';
SET 2 = 'b'; SET 2 = 'b';
END */;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_client = @saved_cs_client */ ;
...@@ -768,7 +768,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ...@@ -768,7 +768,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = '' */ ; /*!50003 SET sql_mode = '' */ ;
DELIMITER ;; DELIMITER ;;
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p2`( CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
INOUT 1 CHAR(10) CHARACTER SET utf8, INOUT 1 CHAR(10) CHARACTER SET utf8,
OUT 2 CHAR(10) CHARACTER SET utf8) OUT 2 CHAR(10) CHARACTER SET utf8)
BEGIN BEGIN
...@@ -785,7 +785,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6, ...@@ -785,7 +785,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6,
@@character_set_client AS c8; @@character_set_client AS c8;
SET 1 = 'a'; SET 1 = 'a';
SET 2 = 'b'; SET 2 = 'b';
END */;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_client = @saved_cs_client */ ;
...@@ -810,7 +810,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ...@@ -810,7 +810,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = '' */ ; /*!50003 SET sql_mode = '' */ ;
DELIMITER ;; DELIMITER ;;
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p3`( CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
INOUT 1 CHAR(10), INOUT 1 CHAR(10),
OUT 2 CHAR(10)) OUT 2 CHAR(10))
BEGIN BEGIN
...@@ -827,7 +827,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6, ...@@ -827,7 +827,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6,
@@character_set_client AS c8; @@character_set_client AS c8;
SET 1 = 'a'; SET 1 = 'a';
SET 2 = 'b'; SET 2 = 'b';
END */;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_client = @saved_cs_client */ ;
...@@ -844,7 +844,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; ...@@ -844,7 +844,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = '' */ ; /*!50003 SET sql_mode = '' */ ;
DELIMITER ;; DELIMITER ;;
/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `p4`( CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
INOUT 1 CHAR(10) CHARACTER SET utf8, INOUT 1 CHAR(10) CHARACTER SET utf8,
OUT 2 CHAR(10) CHARACTER SET utf8) OUT 2 CHAR(10) CHARACTER SET utf8)
BEGIN BEGIN
...@@ -861,7 +861,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6, ...@@ -861,7 +861,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c6,
@@character_set_client AS c8; @@character_set_client AS c8;
SET 1 = 'a'; SET 1 = 'a';
SET 2 = 'b'; SET 2 = 'b';
END */;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_client = @saved_cs_client */ ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment