#5023 always include the update callback in the handlerton on the mainline refs[t:5023]

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

storage/tokudb/ha_tokudb.h

@@ -5,19 +5,16 @@
 #pragma interface               /* gcc class implementation */
 #endif
 
-#define TOKU_INCLUDE_CHECKPOINT_LOCK 1
-
 #if 50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 0
 #else
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
 #endif
 
-#define TOKU_INCLUDE_UPDATE_FUN 1
-
 #if !defined(HA_CLUSTERING)
 #define HA_CLUSTERING 0
 #endif
+
 #if !defined(HA_CLUSTERED_INDEX)
 #define HA_CLUSTERED_INDEX 0
 #endif

storage/tokudb/ha_tokudb_update_fun.cc

-#if TOKU_INCLUDE_UPDATE_FUN
 
 #define UP_COL_ADD_OR_DROP 0
 
@@ -589,5 +588,3 @@ cleanup:
     my_free(new_val_data, MYF(MY_ALLOW_ZERO_PTR));
     return error;    
 }
-
-#endif

storage/tokudb/hatoku_hton.cc

@@ -494,9 +494,7 @@ static int tokudb_init_func(void *p) {
     assert(!r);
     r = db_env->set_generate_row_callback_for_del(db_env,generate_row_for_del);
     assert(!r);
-#if TOKU_INCLUDE_UPDATE_FUN
     db_env->set_update(db_env, tokudb_update_fun);
-#endif
     r = db_env->open(db_env, tokudb_home, tokudb_init_flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
 
     if (tokudb_debug & TOKUDB_DEBUG_INIT) TOKUDB_TRACE("%s:env opened:return=%d\n", __FUNCTION__, r);