diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-12 11:42:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-12 11:42:00 +0100 |
| commit | 976e242c78a76f95ea416f1602b53dcdea961765 (patch) | |
| tree | 30a18d385e4da2173121033590a65747033c2dbe /storage/tokudb | |
| parent | 70f6ac10b3130f14205dbcc56c7089c1c139afd3 (diff) | |
| download | mariadb-git-976e242c78a76f95ea416f1602b53dcdea961765.tar.gz | |
update tokudb version. mask tests that are broken there.
Diffstat (limited to 'storage/tokudb')
5 files changed, 18 insertions, 1 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index c5197dd5dc0..91f92c9ef14 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -15,7 +15,7 @@ IF(NOT TOKUDB_OK) ENDIF() ############################################ -SET(ENV{TOKUDB_VERSION} "7.0.4") +SET(ENV{TOKUDB_VERSION} "7.1.0") SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE) SET(USE_BDB OFF CACHE BOOL "") SET(USE_VALGRIND OFF CACHE BOOL "") diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test index 1becf71a80a..b42c2dd9175 100644 --- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test +++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test @@ -1,4 +1,8 @@ # verify that information_schema.tokudb_locks gets populated with locks, information_schema.tokudb_lock_waits gets +if (`select @@tokudb_version <= "7.1.0"`) +{ + --skip Not fixed in TokuDB 7.1.0 or earlier +} # populated with 1 lock_wait and all transactions are present in information_schema.tokudb_trx for 2 clients source include/have_tokudb.inc; diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test index 87656f29395..8d21e601380 100644 --- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test +++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test @@ -1,3 +1,7 @@ +if (`select @@tokudb_version <= "7.1.0"`) +{ + --skip Not fixed in TokuDB 7.1.0 or earlier +} # verify that tokudb_locks and tokudb_lock_waits contents for 2 conflicting transactions with a lock timeout source include/have_tokudb.inc; diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test index 52c09c1c049..6a1b96c53a2 100644 --- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test +++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test @@ -1,3 +1,7 @@ +if (`select @@tokudb_version <= "7.1.0"`) +{ + --skip Not fixed in TokuDB 7.1.0 or earlier +} # verify that information_schema.tokudb_locks gets populated with locks for 2 clients source include/have_tokudb.inc; diff --git a/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test index 14b6079acc9..8fa44de9cae 100644 --- a/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test +++ b/storage/tokudb/mysql-test/tokudb_add_index/t/add_index_6.test @@ -1,3 +1,8 @@ +if (`select @@tokudb_version <= "7.1.0"`) +{ + --skip Not fixed in TokuDB 7.1.0 or earlier +} + #--source include/have_tokudb.inc SET DEFAULT_STORAGE_ENGINE='tokudb'; # |