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

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

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


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
sql/item_func.cc:
  Auto merged
include/my_pthread.h:
  Manual merged
mysql-test/r/myisam.result:
  Manual merged
mysys/thr_alarm.c:
  Manual merged
sql/ha_ndbcluster.cc:
  Manual merged
sql/mysqld.cc:
  Manual merged
This commit is contained in:
unknown
2007-01-29 18:47:46 +01:00
parent 92a7c1ed9c d308799383
commit 1042a25a7f
12 changed files with 869 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/my_pthread.h
View File

@@ -30,6 +30,14 @@ 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.
@@ -49,7 +57,6 @@ extern "C" {
#define NPTL_PTHREAD_EXIT_BUG 1
#endif
#if defined(__WIN__) || defined(OS2)
#ifdef OS2