diff options
| author | unknown <kent@mysql.com> | 2005-10-06 03:49:14 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-10-06 03:49:14 +0200 |
| commit | 3c2dca475dfa91c95f2488831fafacacaf852347 (patch) | |
| tree | b8cf9d7e88d91c2c65a75d919d3497d44ea4303f | |
| parent | 157e1fcb642cffffc68e380e1ecd30bb03a01c4a (diff) | |
| download | mariadb-git-3c2dca475dfa91c95f2488831fafacacaf852347.tar.gz | |
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
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 132a298bc69..057b71356db 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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) diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 633af122db8..c80e457d2bb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -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; |