Commit a3df2a4c authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

Merge mysql.com:/misc/mysql/mysql-5.1 

into  mysql.com:/misc/mysql/mysql-5.1-opt
parents fe0bff70 02235ace

CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF 
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")



#TODO: update the code and remove the disabled warnings

SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")

SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

client/mysqltest.c

+25 −9
Original line number Diff line number Diff line
@@ -536,6 +536,17 @@ static int do_send_query(struct st_connection *cn, const char *q, int q_len, 
  return 0;

}



static void wait_query_thread_end(struct st_connection *con)

{

  if (!con->query_done)

  {

    pthread_mutex_lock(&con->mutex);

    while (!con->query_done)

      pthread_cond_wait(&con->cond, &con->mutex);

    pthread_mutex_unlock(&con->mutex);

  }

}



#else /*EMBEDDED_LIBRARY*/



#define do_send_query(cn,q,q_len,flags) mysql_send_query(&cn->mysql, q, q_len)
@@ -4069,7 +4080,14 @@ void do_close_connection(struct st_command *command) 
      con->mysql.net.vio = 0;

    }

  }

#endif

#else

  /*

    As query could be still executed in a separate theread

    we need to check if the query's thread was finished and probably wait

    (embedded-server specific)

  */

  wait_query_thread_end(con);

#endif /*EMBEDDED_LIBRARY*/

  if (con->stmt)

    mysql_stmt_close(con->stmt);

  con->stmt= 0;
@@ -4357,6 +4375,9 @@ void do_connect(struct st_command *command) 
          (int) (sizeof(connections)/sizeof(struct st_connection)));

  }



#ifdef EMBEDDED_LIBRARY

  con_slot->query_done= 1;

#endif

  if (!mysql_init(&con_slot->mysql))

    die("Failed on mysql_init()");

  if (opt_compress || con_compress)
@@ -5859,12 +5880,7 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    query's thread was finished and probably wait

  */

  else if (flags & QUERY_REAP_FLAG)

  {

    pthread_mutex_lock(&cn->mutex);

    while (!cn->query_done)

      pthread_cond_wait(&cn->cond, &cn->mutex);

    pthread_mutex_unlock(&cn->mutex);

  }

    wait_query_thread_end(cn);

#endif /*EMBEDDED_LIBRARY*/

  if (!(flags & QUERY_REAP_FLAG))

    DBUG_VOID_RETURN;

include/config-win.h

+1 −3
Original line number Diff line number Diff line
@@ -158,14 +158,12 @@ typedef uint rf_SetTimer; 


#define Socket_defined

#define my_socket SOCKET

#define bool BOOL

#define SIGPIPE SIGINT

#define RETQSORTTYPE void

#define QSORT_TYPE_IS_VOID

#define RETSIGTYPE void

#define SOCKET_SIZE_TYPE int

#define my_socket_defined

#define bool_defined

#define byte_defined

#define HUGE_PTR

#define STDCALL __stdcall	    /* Used by libmysql.dll */
@@ -407,4 +405,4 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_CHARSET_ujis 1

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

#define HAVE_BOOL 1

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ 
typedef short		int15;	/* Most effective integer 0 <= x <= 32767 */

typedef int		myf;	/* Type of MyFlags in my_funcs */

typedef char		my_bool; /* Small bool */

#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))

#if !defined(bool) && (!defined(HAVE_BOOL) || !defined(__cplusplus))

typedef char		bool;	/* Ordinary boolean values 0 1 */

#endif

	/* Macros for converting *constants* to the right type */

mysql-test/r/change_user.result

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects; 
1

SELECT @@global.max_join_size;

@@global.max_join_size

18446744073709551615

HA_POS_ERROR

change_user

SELECT @@session.sql_big_selects;

@@session.sql_big_selects

1

SELECT @@global.max_join_size;

@@global.max_join_size

18446744073709551615

HA_POS_ERROR

SET @@global.max_join_size = 10000;

SET @@session.max_join_size = default;

change_user