diff options
| author | Michael Widenius <monty@mysql.com> | 2008-12-04 02:36:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-12-04 02:36:55 +0200 |
| commit | d83f6470243057fdd542bed0410dcabe09766713 (patch) | |
| tree | 982a6bdd41bd78853cdbbbd0f307330272374c36 /mysys/my_init.c | |
| parent | fb68158856f8d74372c8fa0c14553cd18dc9811b (diff) | |
| download | mariadb-git-d83f6470243057fdd542bed0410dcabe09766713.tar.gz | |
Fixed warnings and errors discovered by pushbuild2
mysys/my_init.c:
Fixed link error when compiling without thread support
sql/item_create.cc:
Fixed compiler warning
sql/mysqld.cc:
Fixed compile error on windows
sql/protocol.cc:
Fixed compiler warning
sql/sql_class.cc:
Fixed compiler warning
sql/sql_class.h:
Fixed compiler warning
storage/myisam/mi_open.c:
Fixed compiler warning
storage/myisammrg/ha_myisammrg.cc:
Fixed compiler warning (shadow variable)
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 453e62b19bb..6d79472edfa 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -199,7 +199,9 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", #endif #if defined(SAFEMALLOC) /* Wait for other threads to free mysys_var */ +#ifdef THREAD (void) my_wait_for_other_threads_to_die(1); +#endif TERMINATE(stderr, (infoflag & MY_GIVE_INFO) != 0); #elif defined(__WIN__) && defined(_MSC_VER) _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); |