summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorgbichot@production.mysql.com <>2005-03-22 00:28:33 +0100
committergbichot@production.mysql.com <>2005-03-22 00:28:33 +0100
commit56495a3691a2a23933c5836d659233d789b1fd49 (patch)
treef26bb4d4c7bd39c3ca6a2cedc0f700acdc75416b /client
parentd8b078e4237a9490c5bc05f5b494214d5928d7c9 (diff)
parentc766efdc5db3f54650f9202225a82db715e75e6f (diff)
downloadmariadb-git-56495a3691a2a23933c5836d659233d789b1fd49.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index c296447def9..59c90f59e8e 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -33,9 +33,9 @@
#undef MYSQL_SERVER
#include "client_priv.h"
#include <my_time.h>
-#include "log_event.h"
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
#include "mysql_priv.h"
+#include "log_event.h"
#define BIN_LOG_HEADER_SIZE 4
#define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4)