summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-09-06 22:31:30 +0200
committerSergei Golubchik <sergii@pisem.net>2013-09-06 22:31:30 +0200
commitb838d081ad346e52787753b1799c627922c4a6c7 (patch)
treedc8f1e21e6b40d5b72668571c570c9a3214fbf32 /sql/log_event.h
parent824db55ce53963a64fcf648b54500df22c57e9b2 (diff)
parent72c36f4415815d55ddb82b23682f3c549906c00e (diff)
downloadmariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz
mysql-5.5.33 merge
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 11fff7a8af6..8429f7f0b01 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -40,7 +40,6 @@
#include "rpl_utility.h"
#include "hash.h"
#include "rpl_tblmap.h"
-#include "rpl_tblmap.cc"
#endif
#ifdef MYSQL_SERVER