mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
This commit is contained in:
commit
390d9898f9
68 changed files with 1207 additions and 630 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue