Commit f8e9e29f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree 

into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree


client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 695716e8 dafa39f1

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,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",

libmysql/libmysql.c

+0 −1
Original line number Diff line number Diff line
@@ -2816,7 +2816,6 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt, 
{

  switch (attr_type) {

  case STMT_ATTR_UPDATE_MAX_LENGTH:

    *(my_bool*) value= stmt->update_max_length;

    break;

  case STMT_ATTR_CURSOR_TYPE:

    *(ulong*) value= stmt->flags;

mysql-test/r/mysqldump.result

+5 −5
Original line number Diff line number Diff line
@@ -2279,12 +2279,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;
@@ -2292,17 +2292,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 */;;