From 2e814d4702d71a04388386a9f591d14a35980bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Fri, 12 Aug 2016 11:17:45 +0300 Subject: Merge InnoDB 5.7 from mysql-5.7.9. Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge --- mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test') diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test index edf63c70782..753985e1af0 100644 --- a/mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test @@ -13,8 +13,10 @@ select @@global.innodb_ft_min_token_size; select @@session.innodb_ft_min_token_size; show global variables like 'innodb_ft_min_token_size'; show session variables like 'innodb_ft_min_token_size'; +--disable_warnings select * from information_schema.global_variables where variable_name='innodb_ft_min_token_size'; select * from information_schema.session_variables where variable_name='innodb_ft_min_token_size'; +--enable_warnings # # show that it's read-only -- cgit v1.2.1