diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 1 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 2 | ||||
| -rw-r--r-- | mysys/testhash.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index c2bfdde0ddd..efeee0fbc76 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -214,6 +214,7 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", WSACleanup(); #endif /* __WIN__ */ my_init_done=0; + DBUG_VOID_RETURN; } /* my_end */ diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 4d23d01cd82..d93f45091c6 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -282,7 +282,7 @@ const char *my_thread_name(void) if (!tmp->name[0]) { long id=my_thread_id(); - sprintf(name_buff,"T@%ld", id); + sprintf(name_buff,"T@%lu", id); strmake(tmp->name,name_buff,THREAD_NAME_SIZE); } return tmp->name; diff --git a/mysys/testhash.c b/mysys/testhash.c index d15016113cd..a0bc6685d61 100644 --- a/mysys/testhash.c +++ b/mysys/testhash.c @@ -250,7 +250,6 @@ err: static int get_options(int argc, char **argv) { char *pos,*progname; - DEBUGGER_OFF; progname= argv[0]; @@ -270,7 +269,6 @@ static int get_options(int argc, char **argv) printf("Usage: %s [-?ABIKLWv] [-m#] [-t#]\n",progname); exit(0); case '#': - DEBUGGER_ON; DBUG_PUSH (++pos); break; } |