diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 3 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 4 | ||||
| -rw-r--r-- | mysys/my_init.c | 10 | ||||
| -rw-r--r-- | mysys/my_netware.c | 2 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 22 |
5 files changed, 28 insertions, 13 deletions
diff --git a/mysys/default.c b/mysys/default.c index a913db2c487..81290322223 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -471,6 +471,7 @@ static char *remove_end_comment(char *ptr) return ptr; } +#include <help_start.h> void print_defaults(const char *conf_file, const char **groups) { @@ -523,3 +524,5 @@ void print_defaults(const char *conf_file, const char **groups) --defaults-file=# Only read default options from the given file #\n\ --defaults-extra-file=# Read this file after the global files are read"); } + +#include <help_end.h> diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index da7c0ebd1d2..694c4685667 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -690,6 +690,8 @@ static void init_variables(const struct my_option *options) Print help for all options and variables. */ +#include <help_start.h> + void my_print_help(const struct my_option *options) { uint col, name_space= 22, comment_space= 57; @@ -815,3 +817,5 @@ void my_print_variables(const struct my_option *options) } } } + +#include <help_end.h> diff --git a/mysys/my_init.c b/mysys/my_init.c index 8d4ba2c97b6..dd06ae41dcb 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -354,14 +354,16 @@ static my_bool win32_init_tcp_ip() #ifdef __NETWARE__ -/**************************************************************************** - Do basic initialisation for netware needed by most programs -****************************************************************************/ +/* + Basic initialisation for netware +*/ static void netware_init() { char cwd[PATH_MAX], *name; + DBUG_ENTER("netware_init"); + /* init only if we are not a client library */ if (my_progname) { @@ -399,5 +401,7 @@ static void netware_init() } } } + + DBUG_VOID_RETURN; } #endif /* __NETWARE__ */ diff --git a/mysys/my_netware.c b/mysys/my_netware.c index e41dbd0a029..9c604778c2d 100644 --- a/mysys/my_netware.c +++ b/mysys/my_netware.c @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - Function specific to netware + Functions specific to netware */ #include <mysys_priv.h> 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 |