Commit 800061bd authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/my/mysql-5.0
parents 92f80fbb 91afe31f

VC++Files/test1/mysql_thr.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t; 
#define pthread_mutex_lock(A)    (EnterCriticalSection(A),0)

#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)

#define pthread_mutex_destroy(A) DeleteCriticalSection(A)

#define pthread_handler_t unsigned __cdecl *

#define pthread_handler_t unsigned __cdecl

typedef unsigned (__cdecl *pthread_handler)(void *);

#define pthread_self() GetCurrentThread()

VC++Files/thr_test/thr_test.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t; 
#define pthread_mutex_lock(A)    (EnterCriticalSection(A),0)

#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)

#define pthread_mutex_destroy(A) DeleteCriticalSection(A)

#define pthread_handler_t unsigned __cdecl *

#define pthread_handler_t unsigned __cdecl

typedef unsigned (__cdecl *pthread_handler)(void *);

#define pthread_self() GetCurrentThread()

sql/log_event.cc

+3 −4
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, 
    But it's likely that we don't want to use 32 bits for 3 bits; in the future

    we will probably want to reclaim the 29 bits. So we need the &.

  */

  flags2= thd_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG;

  flags2= (uint32) (thd_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG);

  DBUG_ASSERT(thd->variables.character_set_client->number < 256*256);

  DBUG_ASSERT(thd->variables.collation_connection->number < 256*256);

  DBUG_ASSERT(thd->variables.collation_server->number < 256*256);
@@ -2984,9 +2984,8 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg, 
                      llstr(pos_arg, buff), flags));

#endif

  if (flags & DUP_NAME)

    new_log_ident= my_strdup_with_length(new_log_ident_arg,

                                         ident_len,

                                         MYF(MY_WME));

    new_log_ident= my_strdup_with_length((const byte*) new_log_ident_arg,

                                         ident_len, MYF(MY_WME));

  DBUG_VOID_RETURN;

}

#endif