diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-12-19 11:35:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-12-19 11:35:44 +0100 |
| commit | a978bdda1e2de35c79e432f026869e163657a263 (patch) | |
| tree | 73e36b02fe3b8515c1f05bf4d43ecfa0bbf7c420 /mysys/my_wincond.c | |
| parent | 724dbaabc0d06c4446417eb217d8536f193461f9 (diff) | |
| parent | 0773c7f422c426e5693fc901df9999092e56aef3 (diff) | |
| download | mariadb-git-a978bdda1e2de35c79e432f026869e163657a263.tar.gz | |
mysql-5.5.41 merge
Diffstat (limited to 'mysys/my_wincond.c')
| -rw-r--r-- | mysys/my_wincond.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c index 6674a5d394d..c761064dd96 100644 --- a/mysys/my_wincond.c +++ b/mysys/my_wincond.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -328,26 +328,4 @@ int pthread_attr_destroy(pthread_attr_t *connect_att) return 0; } -/**************************************************************************** -** Fix localtime_r() to be a bit safer -****************************************************************************/ - -struct tm *localtime_r(const time_t *timep,struct tm *tmp) -{ - if (*timep == (time_t) -1) /* This will crash win32 */ - { - bzero(tmp,sizeof(*tmp)); - } - else - { - struct tm *res=localtime(timep); - if (!res) /* Wrong date */ - { - bzero(tmp,sizeof(*tmp)); /* Keep things safe */ - return 0; - } - *tmp= *res; - } - return tmp; -} #endif /* __WIN__ */ |