Jan Lindström 9a5787db51 Merge commit '96badb16afcf' into 10.0 ... Conflicts: client/mysql_upgrade.c mysql-test/r/func_misc.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/innodb/r/innodb-fk.result mysql-test/t/subselect_sj_mat.test sql/item.cc sql/item_func.cc sql/log.cc sql/log_event.cc sql/rpl_utility.cc sql/slave.cc sql/sql_class.cc sql/sql_class.h sql/sql_select.cc storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/handler/ha_innodb.cc storage/xtradb/dict/dict0crea.c storage/xtradb/dict/dict0dict.c storage/xtradb/handler/ha_innodb.cc vio/viosslfactories.c		2015-08-03 23:09:43 +03:00
..
archive
blackhole
cassandra	Backport from 10.1 to 10.0: Merge pull request #33 from k0da/mdev-7839	2015-03-25 19:44:31 +03:00
connect	CONNECT: compiler warnings	2015-07-27 10:52:22 +02:00
csv
example
federated	Merge branch '5.5' into 10.0	2015-05-04 22:00:24 +02:00
federatedx	Merge branch '5.5' into 10.0	2015-06-11 20:20:35 +02:00
heap
innobase	Merge commit '96badb16afcf' into 10.0	2015-08-03 23:09:43 +03:00
maria	Merge branch '5.5' into 10.0	2015-06-11 20:20:35 +02:00
mroonga	MDEV-8506 mroonga/wrapper.performance_schema fails in buildbot on bld-dan-release	2015-07-20 20:16:32 +03:00
myisam	Merge branch '5.5' into 10.0	2015-06-11 20:20:35 +02:00
myisammrg	Storage engines tests: ALTER ONLINE works differently for MERGE in 10.0	2014-12-05 21:38:16 +04:00
ndb
oqgraph	MDEV-8128 cmake fails to detect boost libraries	2015-06-16 23:58:14 +02:00
perfschema	Merge branch 'merge-perfschema-5.6' into 10.0	2015-06-16 12:47:58 +02:00
sequence
sphinx	Merge branch '5.5' into 10.0	2015-06-11 20:20:35 +02:00
spider	convert files from CRLF to LF line endings	2015-05-08 11:48:16 +02:00
test_sql_discovery
tokudb	Merge branch '5.5' into 10.0	2015-06-11 20:20:35 +02:00
xtradb	Merge commit '96badb16afcf' into 10.0	2015-08-03 23:09:43 +03:00