summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorunknown <jani@prima.mysql.com>2000-11-18 13:05:16 +0200
committerunknown <jani@prima.mysql.com>2000-11-18 13:05:16 +0200
commit08cb49f0aeeab99223ec833faaca58d25af72268 (patch)
tree5b6670f82ec57f9f914e1134201a7e2e82e1c6b1 /sql/log_event.h
parent352cab301ccd9519e038633edfc942fc36fa22a1 (diff)
parent5abcec92c0abcc76658908791cf7f9d2fcc8004a (diff)
downloadmariadb-git-08cb49f0aeeab99223ec833faaca58d25af72268.tar.gz
Merge narttu:/my/bk/mysql into prima.mysql.com:/home/my/bk/mysql
client/mysql.cc: Auto merged
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index fb71a52a82e..c956cfde396 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -363,7 +363,7 @@ public:
Stop_log_event(IO_CACHE* file, time_t when_arg, uint32 server_id):
Log_event(when_arg,0,0,server_id)
{
- char skip[4];
+ byte skip[4];
my_b_read(file, skip, sizeof(skip)); // skip the event length
}
Stop_log_event(const char* buf):Log_event(buf)