refs #5195 rearrange some capability macros

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

storage/tokudb/hatoku_defines.h

@@ -42,7 +42,7 @@
 #define TOKU_INCLUDE_XA 1
 #endif
 
-#if MYSQL_VERSION_ID < 50500
+#if 50100 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID < 50299
 #define TOKU_INCLUDE_ALTER_51 1
 #define TOKU_INCLUDE_ROW_TYPE_COMPRESSION 1
 #define TOKU_INCLUDE_XA 1

storage/tokudb/hatoku_hton.cc

@@ -207,9 +207,9 @@ static int tokudb_rollback(handlerton * hton, THD * thd, bool all);
 #if TOKU_INCLUDE_XA
 static int tokudb_xa_prepare(handlerton* hton, THD* thd, bool all);
 static int tokudb_xa_recover(handlerton* hton, XID*  xid_list, uint  len);
-#endif
 static int tokudb_commit_by_xid(handlerton* hton, XID* xid);
 static int tokudb_rollback_by_xid(handlerton* hton, XID*  xid);
+#endif
 
 #if defined(HA_GENERAL_ONLINE) || defined(HA_INPLACE_ADD_INDEX_NO_READ_WRITE)
 static uint tokudb_alter_table_flags(uint flags);
@@ -361,9 +361,9 @@ static int tokudb_init_func(void *p) {
 #if TOKU_INCLUDE_XA
     tokudb_hton->prepare=tokudb_xa_prepare;
     tokudb_hton->recover=tokudb_xa_recover;
-#endif
     tokudb_hton->commit_by_xid=tokudb_commit_by_xid;
     tokudb_hton->rollback_by_xid=tokudb_rollback_by_xid;
+#endif
 
     tokudb_hton->panic = tokudb_end;
     tokudb_hton->flush_logs = tokudb_flush_logs;
@@ -901,8 +901,6 @@ static int tokudb_xa_recover(handlerton* hton, XID*  xid_list, uint  len) {
     TOKUDB_DBUG_RETURN((int)num_returned);
 }
 
-#endif
-
 static int tokudb_commit_by_xid(handlerton* hton, XID* xid) {
     TOKUDB_DBUG_ENTER("tokudb_commit_by_xid");
     int r = 0;
@@ -937,6 +935,8 @@ static int tokudb_rollback_by_xid(handlerton* hton, XID*  xid) {
     TOKUDB_DBUG_RETURN(r);
 }
 
+#endif
+
 static int tokudb_savepoint(handlerton * hton, THD * thd, void *savepoint) {
     TOKUDB_DBUG_ENTER("tokudb_savepoint");
     int error;