diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-05-13 08:48:00 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-05-13 08:48:00 -0700 |
| commit | 4161dc49b3a8e0281f70e0362098c16fe291720d (patch) | |
| tree | c861b8090364d511ed5eec125964d3df9123cedd /mysys/mf_getdate.c | |
| parent | 10611fe61bbfafbeee96915a8ddaaf555ff36e28 (diff) | |
| parent | c65ebb5d137431b7b42636c3d7aa55132a42255e (diff) | |
| download | mariadb-git-4161dc49b3a8e0281f70e0362098c16fe291720d.tar.gz | |
Merge from 5.0-bugteam
Diffstat (limited to 'mysys/mf_getdate.c')
| -rw-r--r-- | mysys/mf_getdate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_getdate.c b/mysys/mf_getdate.c index 3a8e1be6a0b..9475bebd107 100644 --- a/mysys/mf_getdate.c +++ b/mysys/mf_getdate.c @@ -45,15 +45,15 @@ void get_date(register char * to, int flag, time_t date) skr=date ? (time_t) date : my_time(0); #if defined(HAVE_LOCALTIME_R) && defined(_REENTRANT) if (flag & GETDATE_GMT) - localtime_r(&skr,&tm_tmp); - else gmtime_r(&skr,&tm_tmp); + else + localtime_r(&skr,&tm_tmp); start_time= &tm_tmp; #else if (flag & GETDATE_GMT) - start_time= localtime(&skr); - else start_time= gmtime(&skr); + else + start_time= localtime(&skr); #endif if (flag & GETDATE_SHORT_DATE) sprintf(to,"%02d%02d%02d", |