Monty cded083a37 MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes ... Problem was that a parallel open of a table, overwrote info->state that was in used by repair. Fixed by changing _ma_tmp_disable_logging_for_table() to use a new state buffer state.no_logging to store the temporary state. Other things: - Use original number of rows when retrying repair to get rid of a potential warning "Number of rows changed from X to Y" - Changed maria_commit() to make it easier to merge with 10.4 - If table is not locked (like with show commands), use the global number of rows as the local number may not be up to date. (Minor not critical fix) - Added some missing DBUG_RETURN		2018-08-27 22:00:14 +03:00
..
archive	Merge branch '10.0' into 10.1	2017-08-08 10:18:43 +02:00
binlog	Merge branch '10.0' into bb-10.1-merge	2018-07-19 12:55:54 +02:00
binlog_encryption	Merge branch '10.0' into 10.1	2017-01-16 03:18:14 +02:00
csv	Merge 10.0 into 10.1	2017-05-19 12:29:37 +03:00
encryption	MDEV-13103: Improve 'cannot be decrypted' error message	2018-06-13 16:02:40 +03:00
engines	Merge branch '10.0' into 10.1	2017-09-21 22:02:21 +02:00
federated	Merge branch '10.0' into 10.1	2018-06-12 18:55:27 +03:00
funcs_1	Merge branch '10.0' into 10.1	2018-06-12 18:55:27 +03:00
funcs_2	Merge branch '10.0' into 10.1	2017-01-16 03:18:14 +02:00
galera	Merge pull request #828 from tempesta-tech/sysprg/10.1-MDEV-10754	2018-08-21 15:58:09 +03:00
galera_3nodes	Merge branch '10.0-galera' into 10.1	2018-06-12 19:39:37 +03:00
handler	Merge branch '10.0' into 10.1	2018-06-12 18:55:27 +03:00
heap	Merge remote-tracking branch 'origin/5.5' into 10.0	2018-06-20 16:55:24 +04:00
innodb	Merge branch '10.0' into 10.1	2018-07-31 11:58:29 +02:00
innodb_fts	Merge 10.0 into 10.1	2018-08-01 08:45:59 +03:00
innodb_zip	MDEV-14904 Backport innodb_default_row_format	2018-03-07 17:49:42 +02:00
jp	Merge branch 'github/10.0-galera' into 10.1	2015-11-19 17:48:36 +01:00
large_tests
maria	MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes	2018-08-27 22:00:14 +03:00
mariabackup	MDEV-16105: Mariabackup does not support SSL	2018-05-08 19:52:08 +00:00
mtr/t
mtr2
multi_source	MDEV-9544 FLUSH [RELAY] LOGS does not rotate logs for a named slave	2017-06-05 13:11:10 +05:30
optimizer_unfixed_bugs	Merge branch '10.0' into 10.1	2016-12-11 09:53:42 +01:00
parts	Merge branch '10.0' into bb-10.1-merge-sanja	2018-07-25 22:24:40 +02:00
percona	Merge tag 'mariadb-10.0.20' into 10.1	2015-06-27 20:35:26 +02:00
perfschema	MDEV-10679 Crash in performance schema and partitioning with discovery	2018-05-26 12:49:25 +03:00
perfschema_stress
plugins	Merge branch '10.0' into bb-10.1-merge-sanja	2018-07-25 22:24:40 +02:00
roles	Merge branch '10.0' into 10.1	2017-12-20 13:30:05 +02:00
rpl	Merge branch '10.0' into 10.1	2018-08-21 10:07:26 +02:00
storage_engine	Merge branch '10.0' into 10.1	2017-08-08 10:18:43 +02:00
stress	Merge branch '10.0' into 10.1	2016-03-21 13:02:53 +01:00
sys_vars	Merge branch '10.0' into 10.1	2018-07-31 11:58:29 +02:00
unit	Merge branch '5.5' into 10.0	2018-06-21 00:44:10 +02:00
vcol	MDEV-15433: Optimizer does not use group by optimization with distinct	2018-08-05 13:25:40 +03:00
wsrep	Merge branch '10.0-galera' into 10.1	2018-06-12 19:39:37 +03:00