Commit dafa39f1 authored by unknown's avatar unknown
Browse files

Fix version of DEFINER-clause in mysqldump. 

Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.


client/mysqldump.c:
  Fixing version.
mysql-test/r/mysqldump.result:
  Updated the result file.
parent da150725

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ static uint dump_routines_for_db(char *db) 


                query_str_tail= strnmov(query_str, row[2],

                                        definer_begin - row[2]);

                query_str_tail= strmov(query_str_tail, "*/ /*!50019");

                query_str_tail= strmov(query_str_tail, "*/ /*!50020");

                query_str_tail= strnmov(query_str_tail, definer_begin,

                                        definer_end - definer_begin);

                query_str_tail= strxmov(query_str_tail, "*/ /*!50003",

mysql-test/r/mysqldump.result

+5 −5
Original line number Diff line number Diff line
@@ -2210,12 +2210,12 @@ UNLOCK TABLES; 
DELIMITER ;;

/*!50003 DROP FUNCTION IF EXISTS `bug9056_func1` */;;

/*!50003 SET SESSION SQL_MODE=""*/;;

/*!50003 CREATE*/ /*!50019 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11)

/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11)

RETURN a+b */;;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE*/;;

/*!50003 DROP FUNCTION IF EXISTS `bug9056_func2` */;;

/*!50003 SET SESSION SQL_MODE=""*/;;

/*!50003 CREATE*/ /*!50019 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func2`(f1 char binary) RETURNS char(1)

/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 FUNCTION `bug9056_func2`(f1 char binary) RETURNS char(1)

begin

set f1= concat( 'hello', f1 );

return f1;
@@ -2223,17 +2223,17 @@ end */;; 
/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE*/;;

/*!50003 DROP PROCEDURE IF EXISTS `a'b` */;;

/*!50003 SET SESSION SQL_MODE="REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI"*/;;

/*!50003 CREATE*/ /*!50019 DEFINER="root"@"localhost"*/ /*!50003 PROCEDURE "a'b"()

/*!50003 CREATE*/ /*!50020 DEFINER="root"@"localhost"*/ /*!50003 PROCEDURE "a'b"()

select 1 */;;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE*/;;

/*!50003 DROP PROCEDURE IF EXISTS `bug9056_proc1` */;;

/*!50003 SET SESSION SQL_MODE=""*/;;

/*!50003 CREATE*/ /*!50019 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)

/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)

BEGIN SELECT a+b INTO c; end */;;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE*/;;

/*!50003 DROP PROCEDURE IF EXISTS `bug9056_proc2` */;;

/*!50003 SET SESSION SQL_MODE=""*/;;

/*!50003 CREATE*/ /*!50019 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc2`(OUT a INT)

/*!50003 CREATE*/ /*!50020 DEFINER=`root`@`localhost`*/ /*!50003 PROCEDURE `bug9056_proc2`(OUT a INT)

BEGIN 

select sum(id) from t1 into a; 

END */;;