refs #5464 merge partitioned counter printing-in-handlerton fixes from 6.5.0

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

src/ydb.cc

@@ -41,7 +41,7 @@ const char *toku_copyright_string = "Copyright (c) 2007-2012 Tokutek Inc.  All r
 #include "ydb_write.h"
 #include "ydb_txn.h"
 #include "ft/txn_manager.h"
-#include "ft/partitioned_counter.h"
+#include "toku_include/partitioned_counter.h"
 
 // Include ydb_lib.cc here so that its constructor/destructor gets put into
 // ydb.o, to make sure they don't get erased at link time (when linking to

toku_include/CMakeLists.txt

@@ -3,7 +3,7 @@ add_custom_target(generate_config_h DEPENDS
   "${CMAKE_CURRENT_BINARY_DIR}/config.h")
 
 install(
-  FILES toku_list.h toku_os.h
+  FILES toku_list.h toku_os.h partitioned_counter.h
   DESTINATION include
   )
 install(

ft/partitioned_counter.h → toku_include/partitioned_counter.h

@@ -37,8 +37,6 @@
 // This version does not use constructors, essentially reverrting to the google C++ style guide.
 //
 
-#include "fttypes.h"
-
 // The old C interface.  This required a bunch of explicit ___attribute__((__destructor__)) functions to remember to destroy counters at the end.
 typedef struct partitioned_counter *PARTITIONED_COUNTER;
 PARTITIONED_COUNTER create_partitioned_counter(void);