mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
The get_date() function in mysys interpreted the GETDATE_GMT option
backwards, which resulted in the incorrect time being reported at the end of mysqldump. (Bug #44424, patch by Andrew Hutchings)
This commit is contained in:
@@ -45,15 +45,15 @@ void get_date(register my_string to, int flag, time_t date)
|
|||||||
skr=date ? (time_t) date : time((time_t*) 0);
|
skr=date ? (time_t) date : time((time_t*) 0);
|
||||||
#if defined(HAVE_LOCALTIME_R) && defined(_REENTRANT)
|
#if defined(HAVE_LOCALTIME_R) && defined(_REENTRANT)
|
||||||
if (flag & GETDATE_GMT)
|
if (flag & GETDATE_GMT)
|
||||||
localtime_r(&skr,&tm_tmp);
|
|
||||||
else
|
|
||||||
gmtime_r(&skr,&tm_tmp);
|
gmtime_r(&skr,&tm_tmp);
|
||||||
|
else
|
||||||
|
localtime_r(&skr,&tm_tmp);
|
||||||
start_time= &tm_tmp;
|
start_time= &tm_tmp;
|
||||||
#else
|
#else
|
||||||
if (flag & GETDATE_GMT)
|
if (flag & GETDATE_GMT)
|
||||||
start_time= localtime(&skr);
|
|
||||||
else
|
|
||||||
start_time= gmtime(&skr);
|
start_time= gmtime(&skr);
|
||||||
|
else
|
||||||
|
start_time= localtime(&skr);
|
||||||
#endif
|
#endif
|
||||||
if (flag & GETDATE_SHORT_DATE)
|
if (flag & GETDATE_SHORT_DATE)
|
||||||
sprintf(to,"%02d%02d%02d",
|
sprintf(to,"%02d%02d%02d",
|
||||||
|
Reference in New Issue
Block a user