mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Rich Prohaska 2014-01-23 17:28:55 -05:00
commit 33ba98debd
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/tokudb/r/information-schema-global-status.result
View file

@ -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

2
scripts/make.mysql.debug.env.bash
View file

@ -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