#223 build tokudb without upserts

storage/tokudb/ha_tokudb.cc

@@ -103,9 +103,6 @@ extern "C" {
 
 #define MYSQL_SERVER 1
 #include "mysql_version.h"
-#if MYSQL_VERSION_ID < 50506
-#include "mysql_priv.h"
-#else
 #include "sql_table.h"
 #include "handler.h"
 #include "table.h"
@@ -113,6 +110,9 @@ extern "C" {
 #include "sql_class.h"
 #include "sql_show.h"
 #include "discover.h"
+
+#if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || (50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799)
+#include <binlog.h>
 #endif
 
 #include "db.h"

storage/tokudb/ha_tokudb_update.cc

@@ -553,12 +553,6 @@ static bool is_strict_mode(THD *thd) {
 #endif
 }
 
-#if 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
-#include <binlog.h>
-#elif 50500 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50599
-#include <log.h>
-#endif
-
 // Check if an update operation can be handled by this storage engine.  Return true if it can.
 bool ha_tokudb::check_fast_update(THD *thd, List<Item> &fields, List<Item> &values, Item *conds) {
     if (!transaction)