database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge chilla.local:/home/mydev/mysql-4.1-axmrg

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
include/my_pthread.h:
  Manual merged
mysys/default.c:
  Manual merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged
This commit is contained in:
unknown
2007-02-01 10:19:22 +01:00
parent ad7a4ebbe3 62fdcb54a7
commit 8772cb168b
7 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/my_pthread.h
View File

@@ -30,14 +30,6 @@ extern "C" {
#define EXTERNC
#endif /* __cplusplus */
/* Thread library */
#define THD_LIB_OTHER 1
#define THD_LIB_NPTL 2
#define THD_LIB_LT 4
extern uint thd_lib_detected;
/*
BUG#24507: Race conditions inside current NPTL pthread_exit() implementation.
@@ -771,6 +763,16 @@ extern uint my_thread_end_wait_time;
Keep track of shutdown,signal, and main threads so that my_end() will not
report errors with them
*/
/* Which kind of thread library is in use */
#define THD_LIB_OTHER 1
#define THD_LIB_NPTL 2
#define THD_LIB_LT 4
extern uint thd_lib_detected;
extern uint thr_client_alarm;
/* statistics_xxx functions are for not essential statistic */
#ifndef thread_safe_increment