diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-01 12:29:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-01 15:32:06 +0200 |
| commit | df61c5849987267f5daac671e0af8550ae613621 (patch) | |
| tree | c61a26dc7523bfd907b8342086d60ef8b2ef4f06 | |
| parent | 4e89fdb9d8e88607c0992bc2d049010344c0cb3b (diff) | |
| download | mariadb-git-df61c5849987267f5daac671e0af8550ae613621.tar.gz | |
MDEV-14383 tokudb_bugs. tests failed in buildbot, lost connection to server
don't run tokudb tests under tcmalloc,
this is not a supported combination.
| -rw-r--r-- | storage/tokudb/mysql-test/rpl/suite.pm | 3 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/suite.pm | 3 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_add_index/suite.pm | 3 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_alter_table/suite.pm | 3 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_bugs/suite.pm | 3 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb_mariadb/suite.pm | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/rpl/suite.pm b/storage/tokudb/mysql-test/rpl/suite.pm index ba9809a9930..3619ca716bc 100644 --- a/storage/tokudb/mysql-test/rpl/suite.pm +++ b/storage/tokudb/mysql-test/rpl/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; diff --git a/storage/tokudb/mysql-test/tokudb/suite.pm b/storage/tokudb/mysql-test/tokudb/suite.pm index 6c52d0110fe..891969d6c7f 100644 --- a/storage/tokudb/mysql-test/tokudb/suite.pm +++ b/storage/tokudb/mysql-test/tokudb/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; diff --git a/storage/tokudb/mysql-test/tokudb_add_index/suite.pm b/storage/tokudb/mysql-test/tokudb_add_index/suite.pm index ee1d1bde06b..587475d96e8 100644 --- a/storage/tokudb/mysql-test/tokudb_add_index/suite.pm +++ b/storage/tokudb/mysql-test/tokudb_add_index/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm b/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm index 7981fad2c62..73b002a79c4 100644 --- a/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm +++ b/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/suite.pm b/storage/tokudb/mysql-test/tokudb_bugs/suite.pm index a6e01cd6dd4..332a88199fc 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/suite.pm +++ b/storage/tokudb/mysql-test/tokudb_bugs/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm b/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm index ab3da8e6b03..5cb69e7bdab 100644 --- a/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm +++ b/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm @@ -5,6 +5,9 @@ use File::Basename; # Ensure we can run the TokuDB tests even if hugepages are enabled $ENV{TOKU_HUGE_PAGES_OK}=1; +return "Doesn't work with tcmalloc" if $ENV{LD_PRELOAD} =~ /tcmalloc/ and + $mysql_version_id < 100000; + #return "Not run for embedded server" if $::opt_embedded_server; return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb}; |