Monty 7e882a60bf Ensure that table->vcol_set is properly restored if used ... Code in QUICK_RANGE_SELECT::init_ror_merged_scan() could theoretically have caused crashes if this was ever called from an update or delete This also found a bug in the vcol/range.result. file.		2018-01-01 14:44:20 +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-14272 Mariadb crashes with signal 11 when using federatedx engine and galera	2017-12-28 02:13:25 +01:00
funcs_1	un-disable a bunch of funcs_1 tests	2017-08-14 19:45:59 +02:00
funcs_2
galera	Update galera_gtid_slave result file post merge	2017-12-29 09:33:30 +02:00
galera_3nodes	Merge remote-tracking branch 'origin/10.1' into bb-10.2-vicentiu	2017-12-28 19:27:00 +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	Update main.innodb test result post-merge	2017-12-28 19:59:04 +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	Re-remove the file kill_and_restart_mysqld.inc	2017-12-14 08:40:09 +02: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
maria	Merge branch '10.1' into 10.2	2017-10-24 14:53:18 +02:00
mariabackup	Merge remote-tracking branch 'origin/10.1' into 10.2	2017-12-22 12:23:39 +02:00
mtr/t
mtr2
multi_source
optimizer_unfixed_bugs
parts	Merge remote-tracking branch 'origin/10.1' into bb-10.2-vicentiu	2017-12-28 19:27:00 +02:00
percona
perfschema	Merge 10.1 to 10.2	2017-12-19 16:48:28 +02:00
perfschema_stress
plugins	Merge remote-tracking branch 'origin/10.1' into 10.2	2017-12-22 12:23:39 +02:00
roles	Merge remote-tracking branch 'origin/10.1' into 10.2	2017-12-22 12:23:39 +02:00
rpl	MDEV-14249 Wrong character set info of Query_log_event and the query in Query_log_event constructed by different charsets cause error when slave apply the event.	2017-12-27 12:30:05 +04:00
storage_engine	MDEV-14607 storage_engine-rocksdb.type_bit_indexes fails after latest pushes	2017-12-13 00:29:44 +02:00
stress
sys_vars	MDEV-12837: WSREP: BF lock wait long	2017-12-09 11:20:46 +02:00
unit
vcol	Ensure that table->vcol_set is properly restored if used	2018-01-01 14:44:20 +02:00
wsrep	Merge 10.1 into 10.2	2017-08-31 09:30:40 +03:00