3 commits

Author	SHA1	Message	Date
Sergei Golubchik	c8b3244703	fix some quoting in error messages ... add_identifier change comes from 5.7, everything else is a follow-up	2016-09-16 09:54:30 +02:00
Jan Lindström	2e814d4702	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	2016-09-02 13:22:28 +03:00
Jan Lindström	4d3f680c95	MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing page compressed and encrypted tablespace using incorrect keys ... Add error handling to decryp function when decrypt fails during import.	2015-09-14 14:11:23 +03:00