From 5fe8e9f244038f258af07fcb5fe562c812cd7e31 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Tue, 18 Dec 2012 22:03:53 +0100
Subject: [PATCH] After-merge fixes for merge 10.0-base -> 10.0.

---
 sql/sql_class.h                 | 4 ++--
 storage/innobase/log/log0log.cc | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 8df3a2eee36..85ebccabf54 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4369,12 +4369,12 @@ public:
 /**
   Statement that inserts new rows (INSERT, REPLACE, LOAD, ALTER TABLE)
 */
-#define CF_INSERTS_DATA (1U << 11)
+#define CF_INSERTS_DATA (1U << 17)
 
 /**
   Statement that updates existing rows (UPDATE, multi-update)
 */
-#define CF_UPDATES_DATA (1U << 12)
+#define CF_UPDATES_DATA (1U << 18)
 
 /* Bits in server_command_flags */
 
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index 74f6566d588..5e4a9dcf515 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -37,6 +37,7 @@ Created 12/9/1995 Heikki Tuuri
 #endif
 
 #ifndef UNIV_HOTBACKUP
+#include "ha_prototypes.h"
 #include "mem0mem.h"
 #include "buf0buf.h"
 #include "buf0flu.h"