refs #5504 step back

git-svn-id: file:///svn/toku/tokudb@48095 c7de825b-a66e-492c-adef-691d508d4ae1

ft/tokuconst.h

@@ -9,6 +9,16 @@
 #ident "Copyright (c) 2007-2012 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
+/* The number of transaction ids stored in the xids structure is 
+ * represented by an 8-bit value.  The value 255 is reserved. 
+ * The constant MAX_NESTED_TRANSACTIONS is one less because
+ * one slot in the packed leaf entry is used for the implicit
+ * root transaction (id 0).
+ */
+
+
+enum {MAX_NESTED_TRANSACTIONS = 253};
+enum {MAX_TRANSACTION_RECORDS = MAX_NESTED_TRANSACTIONS + 1};
 
 
 #endif

ft/ule-internal.h

@@ -12,7 +12,6 @@
 #ident "Copyright (c) 2007-2012 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
-#include "xids.h"
 
 //1 does much slower debugging
 #define ULE_DEBUG 0

ft/wbuf.h

@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <string.h>
 
+
 #define CRC_INCR
 
 /* When serializing a value, write it into a buffer. */

ft/xids.h

@@ -24,14 +24,6 @@
 #include "wbuf.h"
 #include "tokuconst.h"
 
-/* The number of transaction ids stored in the xids structure is 
- * represented by an 8-bit value.  The value 255 is reserved. 
- * The constant MAX_NESTED_TRANSACTIONS is one less because
- * one slot in the packed leaf entry is used for the implicit
- * root transaction (id 0).
- */
-enum {MAX_NESTED_TRANSACTIONS = 253};
-enum {MAX_TRANSACTION_RECORDS = MAX_NESTED_TRANSACTIONS + 1};
 
 //Retrieve an XIDS representing the root transaction.
 XIDS xids_get_root_xids(void);

src/tests/CMakeLists.txt

@@ -336,7 +336,7 @@ if(BUILD_TESTING)
     get_filename_component(base ${bin} NAME_WE)
 
     add_executable(${base}.tdb ${base})
-    target_link_libraries(${base}.tdb ft ${LIBTOKUDB} ${LIBTOKUPORTABILITY})
+    target_link_libraries(${base}.tdb ${LIBTOKUDB} ${LIBTOKUPORTABILITY})
     set_property(TARGET ${base}.tdb APPEND PROPERTY
       COMPILE_DEFINITIONS "ENVDIR=\"dir.${bin}\";USE_TDB;IS_TDB=1;TOKUDB=1")
     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "dir.${bin}")

src/tests/hotindexer-undo-do-test.cc

@@ -23,7 +23,6 @@
 #include <ft/ule-internal.h>
 #include <ft/le-cursor.h>
 #include "indexer-internal.h"
-#include <ft/xids.h>
 #include <ft/xids-internal.h>
 
 struct txn {