7 files changed, 10 insertions, 18 deletions
diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_32.test b/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit.test
index d9defc7447b..b1ad2cd3821 100644
--- a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_32.test
+++ b/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit.test
@@ -1,4 +1,4 @@
---source include/have_32bit.inc
+--source include/word_size.inc
 --source include/have_innodb.inc
 
 let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;
diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test b/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test
deleted file mode 100644
index 2606d2b5ca8..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
---source include/have_64bit.inc
---source include/have_innodb.inc
-
-let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;
-
-set global innodb_ft_result_cache_limit=5000000000;
-select @@innodb_ft_result_cache_limit;
-
-eval set global innodb_ft_result_cache_limit=$innodb_ft_result_cache_limit_orig;
diff --git a/mysql-test/suite/sys_vars/t/max_digest_length_basic.test b/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
index 38b493b3bab..92a7417568e 100644
--- a/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
+++ b/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 
 --source include/not_embedded.inc
 
diff --git a/mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test b/mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test
index 31692081053..6b48ba95102 100644
--- a/mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
diff --git a/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test b/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test
index cf87c1a7c68..9a89f9aff9e 100644
--- a/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test
+++ b/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
diff --git a/mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test b/mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test
index c10700b8903..378646b0fc9 100644
--- a/mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test
+++ b/mysql-test/suite/sys_vars/t/pfs_session_connect_attrs_size_basic.test
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
index c83f3dc2507..6e3c330ce06 100644
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
@@ -44,22 +44,23 @@ SET @def_var= @@session.transaction_prealloc_size;
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 # Embedded server is shows "cleaning up" as STATE, while non-embedded shows "init"
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
---replace_regex /localhost[:0-9]*/localhost/
+--replace_result Execute Query
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
---replace_regex /localhost[:0-9]*/localhost/
+--replace_result Execute Query
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
---replace_regex /localhost[:0-9]*/localhost/
+--replace_result Execute Query
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
---replace_regex /localhost[:0-9]*/localhost/
+--replace_result Execute Query
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--replace_result Execute Query
 SHOW PROCESSLIST;
 --enable_warnings