Marko Mäkelä d9277732d7 Merge 10.1 into 10.2 ... This should also fix the MariaDB 10.2.2 bug MDEV-13826 CREATE FULLTEXT INDEX on encrypted table fails. MDEV-12634 FIXME: Modify innodb-index-online, innodb-table-online so that they will write and read merge sort files. InnoDB 5.7 introduced some optimizations to avoid using the files for small tables. Many collation test results have been adjusted for MDEV-10191.		2017-09-17 11:05:33 +03:00
..
archive	Merge branch '10.1' into 10.2	2017-07-08 09:56:28 +02:00
blackhole
cassandra	Merge branch '10.1' into 10.2	2017-03-30 12:48:42 +02:00
connect	Merge 10.1 into 10.2	2017-08-29 10:07:33 +03:00
csv	Merge 10.0 into 10.1	2017-05-23 08:59:03 +03:00
example
federated	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
federatedx	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
heap	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
innobase	Merge 10.1 into 10.2	2017-09-17 11:05:33 +03:00
maria	Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLD	2017-08-31 09:30:55 +03:00
mroonga	Merge branch '10.1' into 10.2	2017-07-08 09:56:28 +02:00
myisam	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
myisammrg	Fix results for parts/repair_table test after enabling it for MyISAM	2017-08-28 19:41:13 +03:00
oqgraph	Merge branch '10.1' into 10.2	2017-03-30 12:48:42 +02:00
perfschema	Merge 10.1 into 10.2	2017-05-23 11:09:47 +03:00
rocksdb	MDEV-13602: rocksdb.index_merge_rocksdb2 failed in buildbot	2017-09-12 13:32:09 +03:00
sequence	Fix several compile warnings on Windows	2017-03-17 08:56:57 +00:00
sphinx	Merge 10.1 into 10.2	2017-05-22 09:46:51 +03:00
spider	Merge 10.1 into 10.2	2017-08-31 09:30:40 +03:00
test_sql_discovery
tokudb	Merge branch '10.1' into 10.2	2017-08-17 11:38:34 +02:00
xtradb	Merge 10.1 into 10.2	2017-09-17 11:05:33 +03:00