From 4e89fdb9d8e88607c0992bc2d049010344c0cb3b Mon Sep 17 00:00:00 2001 From: Stephen Long Date: Sat, 17 Aug 2019 12:59:16 -0400 Subject: [PATCH 1/2] MDEV-19837 and MDEV-19816: Change some comments --- sql/item.h | 2 +- sql/sql_insert.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item.h b/sql/item.h index 6dc99970914..26bf8b91053 100644 --- a/sql/item.h +++ b/sql/item.h @@ -606,7 +606,7 @@ public: /* Cache of the result of is_expensive(). */ int8 is_expensive_cache; - /* Reuse size, only used by SP local variable assignment, otherwize 0 */ + /* Reuse size, only used by SP local variable assignment, otherwise 0 */ uint rsize; /* diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ddf9bd155a9..075e37042f4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1881,7 +1881,7 @@ before_trg_err: /****************************************************************************** - Check that all fields with arn't null_fields are used + Check that there aren't any null_fields ******************************************************************************/ int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, From df61c5849987267f5daac671e0af8550ae613621 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 1 Sep 2019 12:29:55 +0200 Subject: [PATCH 2/2] 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. --- storage/tokudb/mysql-test/rpl/suite.pm | 3 +++ storage/tokudb/mysql-test/tokudb/suite.pm | 3 +++ storage/tokudb/mysql-test/tokudb_add_index/suite.pm | 3 +++ storage/tokudb/mysql-test/tokudb_alter_table/suite.pm | 3 +++ storage/tokudb/mysql-test/tokudb_bugs/suite.pm | 3 +++ storage/tokudb/mysql-test/tokudb_mariadb/suite.pm | 3 +++ 6 files changed, 18 insertions(+) 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};