summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-04 01:25:34 +0300
committermonty@hundin.mysql.fi <>2001-09-04 01:25:34 +0300
commit0b2af6bdfdea07361a53fcdb2b3123f7db7ad0b4 (patch)
treec0eafd444d485cadb6d63aa0e7039389526e282c /sql/log_event.cc
parent3a3d1e28e5c6966c4e8b740443869f9857a557b3 (diff)
downloadmariadb-git-0b2af6bdfdea07361a53fcdb2b3123f7db7ad0b4.tar.gz
Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc18
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);
}