From 4c6fbccc2256bb8b36ba4cb6e994ac7c7a876b51 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Thu, 23 Jan 2014 12:59:54 -0500 Subject: [PATCH 1/2] change default debug mysql tree to mysql-5.5.35 --- scripts/make.mysql.debug.env.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make.mysql.debug.env.bash b/scripts/make.mysql.debug.env.bash index 36d3ec65520..87c7cf3bb01 100755 --- a/scripts/make.mysql.debug.env.bash +++ b/scripts/make.mysql.debug.env.bash @@ -55,7 +55,7 @@ function github_clone() { git_tag= mysql=mysql -mysql_tree=mysql-5.5.34 +mysql_tree=mysql-5.5.35 jemalloc=jemalloc jemalloc_tree=3.3.1 ftengine=ft-engine From 81f2aadc4e294d3db62bdd67297cc79eed82d320 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Thu, 23 Jan 2014 13:19:45 -0500 Subject: [PATCH 2/2] Tokutek/ft-index#152 TOKDUB_LOGGER_WAIT_LONG exists --- .../suite/tokudb/r/information-schema-global-status.result | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/tokudb/r/information-schema-global-status.result b/mysql-test/suite/tokudb/r/information-schema-global-status.result index d4dc337c1ca..7290f1c05c6 100644 --- a/mysql-test/suite/tokudb/r/information-schema-global-status.result +++ b/mysql-test/suite/tokudb/r/information-schema-global-status.result @@ -112,6 +112,7 @@ TOKUDB_LOCKTREE_WAIT_COUNT TOKUDB_LOCKTREE_WAIT_ESCALATION_COUNT TOKUDB_LOCKTREE_WAIT_ESCALATION_TIME TOKUDB_LOCKTREE_WAIT_TIME +TOKUDB_LOGGER_WAIT_LONG TOKUDB_LOGGER_WRITES TOKUDB_LOGGER_WRITES_BYTES TOKUDB_LOGGER_WRITES_SECONDS