6 commits

Author	SHA1	Message	Date
Marko Mäkelä	8daa87dc06	Fix a test.	2017-01-27 12:21:31 +02:00
Marko Mäkelä	c6039a11c6	Fix a test.	2017-01-25 16:38:45 +02:00
Marko Mäkelä	08413254b7	Remove references to innodb_file_format. ... innodb_file_format=Barracuda is the default in MariaDB 10.2. Do not set it, because the option will be removed in MariaDB 10.3. Also, do not set innodb_file_per_table=1 because it is the default. Note that MDEV-11828 should fix the test innodb.innodb-64k already in 10.1.	2017-01-18 08:43:11 +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
Monty	7e31279666	Speed up some innodb tests ... Fixed compiler warnings sql/sql_view.cc: Ensure that merged_for_insert is properly reset (Left of an old patch)	2015-10-05 17:14:13 +02:00
Jan Lindström	648fb98eb6	MDEV-6348: mariadb crash signal 11 ... Analysis: sync array output function, should make sure that all used pointers are valid before using them. Merge revision 4225 from lp:maria/5.5.	2014-07-08 18:51:34 +03:00