refs #5254 turn fast upserts on for tokudb

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@50589 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb_update.cc

@@ -399,7 +399,11 @@ static bool clustering_keys_exist(TABLE *table) {
     return false;
 }
 
+#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) {
@@ -410,9 +414,11 @@ bool ha_tokudb::check_fast_update(THD *thd, List<Item> &fields, List<Item> &valu
     if (!transaction)
         return false;
 
+#if 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
     // avoid strict mode arithmetic overflow issues
     if (thd->is_strict_mode())
         return false;
+#endif
 
     // no triggers
     if (table->triggers) 
@@ -660,9 +666,11 @@ bool ha_tokudb::check_upsert(THD *thd, List<Item> &update_fields, List<Item> &up
     if (!transaction)
         return false;
 
+#if 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
     // avoid strict mode arithmetic overflow issues
     if (thd->is_strict_mode())
         return false;
+#endif
 
     // no triggers
     if (table->triggers) 

storage/tokudb/hatoku_defines.h

@@ -52,6 +52,7 @@
 #define TOKU_INCLUDE_XA 1
 #define TOKU_PARTITION_WRITE_FRM_DATA 1
 #define TOKU_INCLUDE_WRITE_FRM_DATA 1
+#define TOKU_INCLUDE_UPSERT 1
 
 #elif 50100 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID < 50299
 #define TOKU_INCLUDE_ALTER_51 1