diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-08-12 11:17:45 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-02 13:22:28 +0300 |
| commit | 2e814d4702d71a04388386a9f591d14a35980bfe (patch) | |
| tree | f3f9b48d116a3738c5e71f3a360ca61f16cfb632 /mysql-test/include/have_xtradb.combinations | |
| parent | 848d211c5c4df00b819cd84d7530cf7d29bb0524 (diff) | |
| download | mariadb-git-2e814d4702d71a04388386a9f591d14a35980bfe.tar.gz | |
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
Diffstat (limited to 'mysql-test/include/have_xtradb.combinations')
| -rw-r--r-- | mysql-test/include/have_xtradb.combinations | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations index 0419dc91171..3454f83cb4d 100644 --- a/mysql-test/include/have_xtradb.combinations +++ b/mysql-test/include/have_xtradb.combinations @@ -6,8 +6,8 @@ innodb-cmpmem innodb-trx innodb-sys-indexes -[xtradb] -innodb -innodb-cmpmem -innodb-trx -innodb-sys-indexes +#[xtradb] +#innodb +#innodb-cmpmem +#innodb-trx +#innodb-sys-indexes |