Commit 3c2dca47 authored by unknown's avatar unknown
Browse files

my_pthread.h: 

  Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'


sql/mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
include/my_pthread.h:
  Let pthread_mutex_init() macro return 0 on Windows
parent 157e1fcb

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ extern int pthread_mutex_destroy (pthread_mutex_t *); 
#define pthread_kill(A,B) raise(B)

#define pthread_exit(A) pthread_dummy()

#else

#define pthread_mutex_init(A,B)  InitializeCriticalSection(A)

#define pthread_mutex_init(A,B)  (InitializeCriticalSection(A),0)

#define pthread_mutex_lock(A)	 (EnterCriticalSection(A),0)

#define pthread_mutex_trylock(A) (WaitForSingleObject((A), 0) == WAIT_TIMEOUT)

#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ extern my_bool sp_automatic_privileges, opt_noacl; 
extern my_bool opt_old_style_user_limits, trust_routine_creators;

extern uint opt_crash_binlog_innodb;

extern char *shared_memory_base_name, *mysqld_unix_port;

extern bool opt_enable_shared_memory;

extern my_bool opt_enable_shared_memory;

extern char *default_tz_name;

extern my_bool opt_large_pages;

extern uint opt_large_page_size;