summaryrefslogtreecommitdiff
path: root/mysys/mf_getdate.c
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-23 11:25:24 -0700
committerunknown <jimw@mysql.com>2005-08-23 11:25:24 -0700
commit4b9431369611b4c3938288c0ef9eaa282f1bb417 (patch)
tree8f25e99f65e13c5974f8f6c711c8e7e6a78520a7 /mysys/mf_getdate.c
parent4eccc160525552fd2421f5dc4b33afb320f2d52b (diff)
downloadmariadb-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 'mysys/mf_getdate.c')
-rw-r--r--mysys/mf_getdate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_getdate.c b/mysys/mf_getdate.c
index b12e68cc1f9..8998da8aefa 100644
--- a/mysys/mf_getdate.c
+++ b/mysys/mf_getdate.c
@@ -54,7 +54,7 @@ void get_date(register my_string to, int flag, time_t date)
if (flag & GETDATE_GMT)
start_time= localtime(&skr);
else
- gmtime(&skr,&tm_tmp);
+ start_time= gmtime(&skr);
#endif
if (flag & GETDATE_SHORT_DATE)
sprintf(to,"%02d%02d%02d",