diff options
| author | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
| commit | 4b9431369611b4c3938288c0ef9eaa282f1bb417 (patch) | |
| tree | 8f25e99f65e13c5974f8f6c711c8e7e6a78520a7 /dbug/my_main.c | |
| parent | 4eccc160525552fd2421f5dc4b33afb320f2d52b (diff) | |
| download | mariadb-git-4b9431369611b4c3938288c0ef9eaa282f1bb417.tar.gz | |
Fix build using --without-server. (Bug #11680)
configure.in:
Fix directories built using --without-server, and add mf_keycache.o
to list of objects only built for thread-safe library, since it requires
threading.
dbug/my_main.c:
Don't try to initialize thread globals if not built with threading.
mysys/Makefile.am:
Remove mf_keycache.c from list of files to build (it will be included
in THREAD_LOBJECTS when appropriate).
mysys/mf_getdate.c:
Fix usage of gmtime().
sql/share/Makefile.am:
Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.
tests/Makefile.am:
Don't link against libmysys explicitly.
Diffstat (limited to 'dbug/my_main.c')
| -rw-r--r-- | dbug/my_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dbug/my_main.c b/dbug/my_main.c index 90af23b42b9..ed1c9329235 100644 --- a/dbug/my_main.c +++ b/dbug/my_main.c @@ -18,7 +18,9 @@ char *argv[]; #if defined(HAVE_PTHREAD_INIT) && defined(THREAD) pthread_init(); /* Must be called before DBUG_ENTER */ #endif +#ifdef THREAD my_thread_global_init(); +#endif { DBUG_ENTER ("main"); DBUG_PROCESS (argv[0]); |