Commit 34e43cd3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-bug14980
parents cefb1dc2 2722db6d

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",

include/my_no_pthread.h

+24 −4
Original line number Diff line number Diff line
@@ -14,15 +14,34 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */





#if !defined(_my_no_pthread_h) && !defined(THREAD)

#define _my_no_pthread_h





/*

  This block is to access some thread-related type definitions

  even in builds which do not need thread functions,

  as some variables (based on these types) are declared

  even in non-threaded builds.

  Case in point: 'mf_keycache.c'

*/

#if defined(__WIN__) || defined(OS2)



#elif defined(HAVE_UNIXWARE7_THREADS)

/* #include <thread.h>   Currently, not relevant. Enable if needed. */



#else /* Normal threads */

#include <pthread.h>



#endif /* defined(__WIN__) */





/*

  This undefs some pthread mutex locks when one isn't using threads

  to make thread safe code, that should also work in single thread

  environment, easier to use.

*/



#if !defined(_my_no_pthread_h) && !defined(THREAD)

#define _my_no_pthread_h



#define pthread_mutex_init(A,B)

#define pthread_mutex_lock(A)

#define pthread_mutex_unlock(A)
@@ -32,4 +51,5 @@ 
#define rw_wrlock(A)

#define rw_unlock(A)

#define rwlock_destroy(A)



#endif

libmysql/libmysql.c

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

    *(unsigned long *) 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
@@ -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 */;;

tests/mysql_client_test.c

+0 −19
Original line number Diff line number Diff line
@@ -14758,24 +14758,6 @@ static void test_bug16143() 
}





/* Bug #16144: mysql_stmt_attr_get type error */



static void test_bug16144()

{

  const my_bool flag_orig= (my_bool) 0xde;

  my_bool flag= flag_orig;

  MYSQL_STMT *stmt;

  myheader("test_bug16144");



  /* Check that attr_get returns correct data on little and big endian CPUs */

  stmt= mysql_stmt_init(mysql);

  mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void*) &flag);

  mysql_stmt_attr_get(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &flag);

  DIE_UNLESS(flag == flag_orig);



  mysql_stmt_close(stmt);

}



/*

  Bug #15613: "libmysqlclient API function mysql_stmt_prepare returns wrong

  field length"
@@ -15137,7 +15119,6 @@ static struct my_tests_st my_tests[]= { 
  { "test_opt_reconnect", test_opt_reconnect },

  { "test_bug12744", test_bug12744 },

  { "test_bug16143", test_bug16143 },

  { "test_bug16144", test_bug16144 },

  { "test_bug15613", test_bug15613 },

  { "test_bug14169", test_bug14169 },

  { 0, 0 }