Seppo Jaakola bd0eae595f References: MDEV-4572 - merge with mariaDB 5.5.31 ... bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31 Text conflict in cmake/cpack_rpm.cmake Text conflict in debian/dist/Debian/control Text conflict in debian/dist/Ubuntu/control Text conflict in sql/CMakeLists.txt Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved. Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved. Text conflict in sql/mysqld.cc Text conflict in support-files/mysql.spec.sh 8 conflicts encountered.		2013-05-26 11:26:58 +03:00
..
archive	merge with mysql-5.5.30 minus few incorrect or not applicable changesets	2013-02-28 18:42:49 +01:00
blackhole	mysql-5.5 merge	2012-06-14 20:05:31 +02:00
csv	MDEV-4243 Warnings/errors while compiling with clang	2013-03-28 20:04:14 +01:00
example	MDEV-399 Combinations defined in the base suite cannot be skipped by overlay	2012-08-01 19:57:36 +02:00
federated	MDEV-388 Creating a federated table with a non-existing server returns a random error code	2013-05-20 23:58:44 +02:00
federatedx	MDEV-388 Creating a federated table with a non-existing server returns a random error code	2013-05-21 13:03:37 +02:00
heap	5.3->5.5 merge	2013-02-28 22:47:29 +01:00
innobase	References: MDEV-4572 - merge with mariaDB 5.5.31	2013-05-26 11:26:58 +03:00
maria	5.3 merge.	2013-05-20 12:36:30 +02:00
myisam	mysql-5.5.31 merge	2013-05-07 13:05:09 +02:00
myisammrg	strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)	2013-04-17 19:42:34 +02:00
ndb	Updated/added copyright headers.	2013-02-25 15:26:00 +01:00
oqgraph	Compilation : fix oqgraph's system check, in case where boost header aren't in standard include directory.	2013-02-24 20:05:26 +01:00
pbxt	mysql-test: sys_vars stub for a new xtradb config variable; tc_log_mmap test;	2012-11-26 18:50:29 +01:00
perfschema	mysql-5.5.31 merge	2013-05-07 13:05:09 +02:00
sphinx	MDEV-3883 Show global status not in order	2013-01-08 21:23:40 +01:00
xtradb	References: MDEV-4572 - merge with mariaDB 5.5.31	2013-05-26 11:26:58 +03:00