[t:4169] Display new engine status variables for cleaner. Refs #4169.

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

storage/tokudb/Makefile.in

@@ -425,7 +425,7 @@ LDADD =
 noinst_HEADERS = 
 EXTRA_LTLIBRARIES = ha_tokudb.la
 pkgplugin_LTLIBRARIES = @plugin_tokudb_shared_target@
-ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -ltokuportability
+ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -l$(TOKUPORTABILITY_LIBNAME)
 ha_tokudb_la_LDFLAGS = -module -rpath $(pkgplugindir)
 ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\" -Wall
 ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc

storage/tokudb/hatoku_hton.cc

@@ -1310,6 +1310,10 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
       SHOWVAL(cleaner_max_buffer_workdone);
       SHOWVAL(cleaner_min_buffer_workdone);
       SHOWVAL(cleaner_total_buffer_workdone);
+      SHOWVAL(cleaner_num_leaf_merges_started);
+      SHOWVAL(cleaner_num_leaf_merges_running);
+      SHOWVAL(cleaner_num_leaf_merges_completed);
+
       SHOWVAL(cleaner_num_dirtied_for_leaf_merge);
       SHOWVAL(flush_total);
       SHOWVAL(flush_in_memory);