List:Commits« Previous MessageNext Message »
From:Vamsikrishna Bhagi Date:November 20 2012 6:09am
Subject:bzr push into mysql-trunk branch (vamsikrishna.bhagi:5042 to 5043)
Bug#14463669
View as plain text  
 5043 Vamsikrishna Bhagi	2012-11-20 [merge]
      Bazaar merge for Bug#14463669 from mysql-5.6.

    modified:
      mysql-test/r/ddl_i18n_koi8r.result
 5042 magnus.blaudd@oracle.com	2012-11-19 [merge]
      Merge

    modified:
      sql/handler.h
      sql/sql_acl.cc
=== modified file 'mysql-test/r/ddl_i18n_koi8r.result'
--- a/mysql-test/r/ddl_i18n_koi8r.result	2011-10-25 10:23:23 +0000
+++ b/mysql-test/r/ddl_i18n_koi8r.result	2012-11-20 06:05:01 +0000
@@ -734,7 +734,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SE
 /*!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(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �� SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
@@ -768,7 +768,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SE
 /*!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(_utf8 'текст') AS c6,
 @@character_set_client AS c8;
 SET �
+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 SE
 /*!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(_utf8 'текст') AS c6,
 @@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 SE
 /*!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 ��@@ COLLATION(_utf8 'текст') AS c6,
 @@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 */ ;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (vamsikrishna.bhagi:5042 to 5043)Bug#14463669Vamsikrishna Bhagi20 Nov