diff options
| author | unknown <monty@mysql.com> | 2004-05-25 22:00:14 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 22:00:14 +0300 |
| commit | b3851363ba8df0b3f55ecb358849a212db4b12a8 (patch) | |
| tree | 2c56473da947b9807f0d1668171870a8e3dbc736 /mysys/my_pthread.c | |
| parent | 699cbc02cc3eac51524a56fc106d013633f336f6 (diff) | |
| download | mariadb-git-b3851363ba8df0b3f55ecb358849a212db4b12a8.tar.gz | |
Added patches from Novell
Build-tools/Do-compile:
Fixed indentation
configure.in:
Added patches from Novell
Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
Defines to make NETWARE patches cleaner
include/thr_alarm.h:
Fixed wrong macro
netware/mysql_install_db.c:
Indentation fix
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 5be38fad734..a8157cc2f91 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -102,16 +102,20 @@ void my_pthread_exit(void *status) NXContext_t ctx; char name[PATH_MAX] = ""; - NXThreadGetContext(tid, &ctx); - NXContextGetName(ctx, name, PATH_MAX); - - /* - "MYSQLD.NLM's LibC Reaper" or "MYSQLD.NLM's main thread" - with a debug build of LibC the reaper can have different names - */ - if (!strindex(name, "\'s")) + /* Do not call pthread_exit if it is not a LibC thread */ + if (tid != 0) { - pthread_exit(status); + NXThreadGetContext(tid, &ctx); + NXContextGetName(ctx, name, PATH_MAX); + + /* + "MYSQLD.NLM's LibC Reaper" or "MYSQLD.NLM's main thread" + with a debug build of LibC the reaper can have different names + */ + if (!strindex(name, "\'s")) + { + pthread_exit(status); + } } } #endif |