1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update tokudb version in CMakeLists.txt, disable unstable tokudb tests

Browse Source
This commit is contained in:
Sergei Golubchik 2014-09-25 19:00:41 +02:00
parent 68354ef272
commit 02125587e1
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/tokudb/CMakeLists.txt
View File

@ -18,7 +18,7 @@ IF(NOT LIBJEMALLOC)
ENDIF()
############################################
SET(TOKUDB_VERSION "7.1.8")
SET(TOKUDB_VERSION "7.5.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 "")
MARK_AS_ADVANCED(BUILDNAME)

12
storage/tokudb/mysql-test/rpl/disabled.def Normal file
View File

@ -0,0 +1,12 @@
rpl_tokudb_delete_pk: unreliable, uses timestamp differences
rpl_tokudb_delete_pk_lookup1: unreliable, uses timestamp differences
rpl_tokudb_update_pk_uc0_lookup0: unreliable, uses timestamp differences
rpl_tokudb_update_pk_uc0_lookup1: unreliable, uses timestamp differences
rpl_tokudb_update_pk_uc1_lookup0: unreliable, uses timestamp differences
rpl_tokudb_update_pk_uc1_lookup1: unreliable, uses timestamp differences
rpl_tokudb_update_unique_uc0_lookup0: unreliable, uses timestamp differences
rpl_tokudb_update_unique_uc0_lookup1: unreliable, uses timestamp differences
rpl_tokudb_write_pk: unreliable, uses timestamp differences
rpl_tokudb_write_pk_uc1: unreliable, uses timestamp differences
rpl_tokudb_write_unique: unreliable, uses timestamp differences
rpl_tokudb_write_unique_uc1: unreliable, uses timestamp differences

2
storage/tokudb/mysql-test/tokudb/disabled.def
View File

@ -59,3 +59,5 @@ mvcc-19: No online ALTER in MariaDB 5.5
mvcc-20: No online ALTER in MariaDB 5.5
mvcc-27: No online OPTIMIZE in MariaDB 5.5
cluster_key_part: engine options on partitioned tables
i_s_tokudb_lock_waits_released: unstable, race conditions
i_s_tokudb_locks_released: unstable, race conditions

4
storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
View File

@ -1,8 +1,4 @@
# verify that information_schema.tokudb_locks gets populated with locks, information_schema.tokudb_lock_waits gets
if (`select @@tokudb_version <= "7.1.7"`)
{
--skip Race condition in the test in TokuDB 7.1.7 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;

4
storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
View File

@ -1,7 +1,3 @@
if (`select @@tokudb_version <= "7.1.7"`)
{
--skip Race condition in the test in TokuDB 7.1.7 or earlier
}
# verify that information_schema.tokudb_locks gets populated with locks for 2 clients
source include/have_tokudb.inc;