#2775 closes[t:2775] conditionally include tokutek enhancements in the handlerton

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

storage/tokudb/ha_tokudb.cc

@@ -6651,9 +6651,11 @@ void ha_tokudb::print_error(int error, myf errflag) {
         error = HA_ERR_LOCK_DEADLOCK;
     if (error == DB_LOCK_NOTGRANTED)
         error = HA_ERR_LOCK_WAIT_TIMEOUT;
+#if defined(HA_ERR_DISK_FULL)
     if (error == ENOSPC) {
         error = HA_ERR_DISK_FULL;
     }
+#endif
     if (error == DB_KEYEXIST) {
         error = HA_ERR_FOUND_DUPP_KEY;
     }

storage/tokudb/ha_tokudb.h

@@ -2,6 +2,11 @@
 #pragma interface               /* gcc class implementation */
 #endif
 
+#if !defined(HA_CLUSTERING)
+#define HA_CLUSTERING 0
+#define HA_CLUSTERED_INDEX 0
+#endif
+
 #include <db.h>
 #include "hatoku_cmp.h"
 

storage/tokudb/hatoku_hton.cc

@@ -1147,21 +1147,25 @@ cleanup:
 
 bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * stat_print, enum ha_stat_type stat_type) {
     switch (stat_type) {
+#if defined(HA_ENGINE_DATA_AMOUNT)
     case HA_ENGINE_DATA_AMOUNT:
         return tokudb_show_data_size(thd, stat_print, false);
         break;
     case HA_ENGINE_DATA_EXACT_AMOUNT:
         return tokudb_show_data_size(thd, stat_print, true);
         break;
+#endif
     case HA_ENGINE_STATUS:
         return tokudb_show_engine_status(thd, stat_print);
         break;
+#if defined(HA_ENGINE_CHECKPOINT_LOCK)
     case HA_ENGINE_CHECKPOINT_LOCK:
         return tokudb_checkpoint_lock(thd, stat_print);
         break;
     case HA_ENGINE_CHECKPOINT_UNLOCK:
         return tokudb_checkpoint_unlock(thd, stat_print);
         break;
+#endif
     default:
         break;
     }