Merge branch 'master' of github.com:Tokutek/ft-engine

12 years ago · 59f633837c
2 changed files with 2 additions and 1 deletions
--- 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
--- 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