After-merge fixes for merge 10.0-base -> 10.0.

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 */
 

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"