diff options
| author | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
| commit | 0cd3d729a5da1cf88bd1d142c90beb2c639bfbd4 (patch) | |
| tree | 2408b4ed8fd028e82c29e702dde98508806df16c /mysys | |
| parent | 31069fb002d714f8ad8eb91068333cf2cedea842 (diff) | |
| parent | 4a17875550a96c0f84871a25f01cfc07854fbd4b (diff) | |
| download | mariadb-git-0cd3d729a5da1cf88bd1d142c90beb2c639bfbd4.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11680
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
sql/hostname.cc:
Resolve conflict
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/Makefile.am | 2 | ||||
| -rw-r--r-- | mysys/mf_getdate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 9c58c18cf59..868f68096ae 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -30,7 +30,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_path.c mf_loadpath.c my_file.c \ my_open.c my_create.c my_dup.c my_seek.c my_read.c \ my_pread.c my_write.c \ - mf_keycache.c mf_keycaches.c my_crc32.c \ + mf_keycaches.c my_crc32.c \ mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \ my_malloc.c my_realloc.c my_once.c mulalloc.c \ 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", |