diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-04 01:25:34 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-04 01:25:34 +0300 |
| commit | 8efe675defa2e40cf7300b167e2dfe922caeea7b (patch) | |
| tree | c0eafd444d485cadb6d63aa0e7039389526e282c /sql | |
| parent | e6088385c582e5a5c645fe4cf5fcb64d83beb9df (diff) | |
| download | mariadb-git-8efe675defa2e40cf7300b167e2dfe922caeea7b.tar.gz | |
Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520
Docs/manual.texi:
Changelog
include/raid.h:
Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
Test for myisam tables with problematic row lengths
sql/log_event.cc:
Portability fix
strings/ctype-euc_kr.c:
Portability fix
strings/ctype-sjis.c:
Portability fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 6e99e031f4a..869167bba2f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -272,24 +272,24 @@ void Log_event::print_header(FILE* file) void Log_event::print_timestamp(FILE* file, time_t* ts) { - struct tm tm_tmp; + struct tm tm_tmp, *res; if (!ts) { ts = &when; } #ifdef MYSQL_SERVER - localtime_r(ts,&tm_tmp); + res=localtime_r(ts,&tm_tmp); #else - localtime(ts); + res=localtime(ts); #endif fprintf(file,"%02d%02d%02d %2d:%02d:%02d", - tm_tmp.tm_year % 100, - tm_tmp.tm_mon+1, - tm_tmp.tm_mday, - tm_tmp.tm_hour, - tm_tmp.tm_min, - tm_tmp.tm_sec); + res->tm_year % 100, + res->tm_mon+1, + res->tm_mday, + res->tm_hour, + res->tm_min, + res->tm_sec); } |