Jan Lindström ba576c5b78 MDEV-14401: Stored procedure that declares a handler that catches ER_LOCK_DEADLOCK error causes thd->is_error() assertion ... This was missing bug fix from MySQL wsrep i.e. Galera. Problem was that if stored procedure declares a handler that catches deadlock error, then the error may have been cleared in method sp_rcontext::handle_sql_condition(). Use wsrep_conflict_state correctly to determine is the error already sent to client. Add test case for both this bug and MDEV-12837: WSREP: BF lock wait long. Test requires both fixes to pass.		2017-12-07 13:08:41 +02:00
..
archive	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
binlog	Merge branch '10.1' into 10.2	2017-11-21 19:47:46 +01:00
binlog_encryption
csv
encryption	Merge 10.1 into 10.2	2017-11-01 09:55:00 +02:00
engines	Merge branch '10.1' into 10.2	2017-09-22 02:27:00 +02:00
federated	MDEV-12951 Server crash [mysqld got exception 0xc0000005]	2017-09-18 10:12:23 +02:00
funcs_1	un-disable a bunch of funcs_1 tests	2017-08-14 19:45:59 +02:00
funcs_2
galera	MDEV-14401: Stored procedure that declares a handler that catches ER_LOCK_DEADLOCK error causes thd->is_error() assertion	2017-12-07 13:08:41 +02:00
galera_3nodes	Merge branch '10.1' into 10.2	2017-10-24 14:53:18 +02:00
gcol	Adjust the test innodb.virtual_stats and rename to gcol.innodb_virtual_stats	2017-12-06 10:37:08 +02:00
handler
heap
innodb	Follow-up fix to MDEV-13201 Assertion srv_undo_sources || ... failed on shutdown during DDL operation	2017-12-06 18:52:28 +02:00
innodb_fts	Adjust the innodb_fts.sync and innodb_fts.sync_block tests for MariaDB	2017-10-27 10:36:20 +03:00
innodb_gis	MariaDB adjustments to innodb_gis tests.	2017-10-25 06:47:08 +03:00
innodb_undo
innodb_zip	Merge 10.0 into 10.1	2017-11-06 18:10:23 +02:00
jp
json	MDEV-13324 JSON_SET returns NULL instead of object.	2017-09-12 14:40:18 +04:00
large_tests	MDEV-11002 large_tests.rpl_slave_net_timeout fails due to connection logging	2017-06-21 21:07:20 +03:00
maria	Merge branch '10.1' into 10.2	2017-10-24 14:53:18 +02:00
mariabackup	MDEV-14536 : during backup, retry read of log blocks, if there is	2017-11-30 16:30:40 +00:00
mtr/t
mtr2
multi_source	MDEV-9544 Fix test case for 10.2	2017-06-10 12:57:59 +05:30
optimizer_unfixed_bugs
parts	Merge tag 'mariadb-10.0.33' into bb-10.0-galera	2017-11-03 12:34:05 +05:30
percona
perfschema	MDEV-12012/MDEV-11969 Can't remove GTIDs for a stale GTID Domain ID	2017-11-15 22:26:32 +02:00
perfschema_stress
plugins	Merge 10.1 into 10.2	2017-11-07 23:02:39 +02:00
roles	Merge branch '10.1' into 10.2	2017-10-24 14:53:18 +02:00
rpl	Merge 10.1 into 10.2	2017-12-05 14:23:57 +02:00
storage_engine	Fix results for parts/repair_table test after enabling it for MyISAM	2017-08-28 19:41:13 +03:00
stress
sys_vars	Merge 10.1 into 10.2	2017-11-07 23:02:39 +02:00
unit
vcol	Merge branch '10.1' into 10.2	2017-10-24 14:53:18 +02:00
wsrep	Merge 10.1 into 10.2	2017-08-31 09:30:40 +03:00