addresses #1149

move some defines out of ha_tokudb.cc and into new file hatoku_defines.h

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

storage/tokudb/ha_tokudb.cc

@@ -50,6 +50,7 @@ static inline void thd_data_set(THD *thd, int slot, void *data) {
 
 #include "tokudb_probes.h"
 
+#include "hatoku_defines.h"
 #include "ha_tokudb.h"
 #include <mysql/plugin.h>
 
@@ -64,54 +65,6 @@ typedef struct st_tokudb_trx_data {
     uint tokudb_lock_count;
 } tokudb_trx_data;
 
-// QQQ how to tune these?
-#define HA_TOKUDB_RANGE_COUNT   100
-/* extra rows for estimate_rows_upper_bound() */
-#define HA_TOKUDB_EXTRA_ROWS    100
-
-/* Bits for share->status */
-#define STATUS_PRIMARY_KEY_INIT 0x1
-
-// tokudb debug tracing
-#define TOKUDB_DEBUG_INIT 1
-#define TOKUDB_DEBUG_OPEN 2
-#define TOKUDB_DEBUG_ENTER 4
-#define TOKUDB_DEBUG_RETURN 8
-#define TOKUDB_DEBUG_ERROR 16
-#define TOKUDB_DEBUG_TXN 32
-#define TOKUDB_DEBUG_AUTO_INCREMENT 64
-#define TOKUDB_DEBUG_SAVE_TRACE 128
-
-#define TOKUDB_TRACE(f, ...) \
-    printf("%d:%s:%d:" f, my_tid(), __FILE__, __LINE__, ##__VA_ARGS__);
-
-#define TOKUDB_DBUG_ENTER(f, ...)      \
-{ \
-    if (tokudb_debug & TOKUDB_DEBUG_ENTER) { \
-        TOKUDB_TRACE(f "\n", ##__VA_ARGS__); \
-    } \
-} \
-    DBUG_ENTER(__FUNCTION__);
-
-
-#define TOKUDB_DBUG_RETURN(r) \
-{ \
-    int rr = (r); \
-    if ((tokudb_debug & TOKUDB_DEBUG_RETURN) || (rr != 0 && (tokudb_debug & TOKUDB_DEBUG_ERROR))) { \
-        TOKUDB_TRACE("%s:return %d\n", __FUNCTION__, rr); \
-    } \
-    DBUG_RETURN(rr); \
-}
-
-#define TOKUDB_DBUG_DUMP(s, p, len) \
-{ \
-    TOKUDB_TRACE("%s:%s", __FUNCTION__, s); \
-    uint i;                                                             \
-    for (i=0; i<len; i++) {                                             \
-        printf("%2.2x", ((uchar*)p)[i]);                                \
-    }                                                                   \
-    printf("\n");                                                       \
-}
 
 const char *ha_tokudb_ext = ".tokudb";
 

storage/tokudb/hatoku_defines.h

+#ifndef _HATOKU_DEF
+#define _HATOKU_DEF
+
+// QQQ how to tune these?
+#define HA_TOKUDB_RANGE_COUNT   100
+/* extra rows for estimate_rows_upper_bound() */
+#define HA_TOKUDB_EXTRA_ROWS    100
+
+/* Bits for share->status */
+#define STATUS_PRIMARY_KEY_INIT 0x1
+
+// tokudb debug tracing
+#define TOKUDB_DEBUG_INIT 1
+#define TOKUDB_DEBUG_OPEN 2
+#define TOKUDB_DEBUG_ENTER 4
+#define TOKUDB_DEBUG_RETURN 8
+#define TOKUDB_DEBUG_ERROR 16
+#define TOKUDB_DEBUG_TXN 32
+#define TOKUDB_DEBUG_AUTO_INCREMENT 64
+#define TOKUDB_DEBUG_SAVE_TRACE 128
+
+#define TOKUDB_TRACE(f, ...) \
+    printf("%d:%s:%d:" f, my_tid(), __FILE__, __LINE__, ##__VA_ARGS__);
+
+#define TOKUDB_DBUG_ENTER(f, ...)      \
+{ \
+    if (tokudb_debug & TOKUDB_DEBUG_ENTER) { \
+        TOKUDB_TRACE(f "\n", ##__VA_ARGS__); \
+    } \
+} \
+    DBUG_ENTER(__FUNCTION__);
+
+
+#define TOKUDB_DBUG_RETURN(r) \
+{ \
+    int rr = (r); \
+    if ((tokudb_debug & TOKUDB_DEBUG_RETURN) || (rr != 0 && (tokudb_debug & TOKUDB_DEBUG_ERROR))) { \
+        TOKUDB_TRACE("%s:return %d\n", __FUNCTION__, rr); \
+    } \
+    DBUG_RETURN(rr); \
+}
+
+#define TOKUDB_DBUG_DUMP(s, p, len) \
+{ \
+    TOKUDB_TRACE("%s:%s", __FUNCTION__, s); \
+    uint i;                                                             \
+    for (i=0; i<len; i++) {                                             \
+        printf("%2.2x", ((uchar*)p)[i]);                                \
+    }                                                                   \
+    printf("\n");                                                       \
+}
+
+
+#endif