Nirbhay Choubey 3c9137deeb Merge branch '5.5' into 5.5-galera ...

Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags

2015-02-18 17:15:57 -05:00

..

include

MDEV-6348: mariadb crash signal 11

2014-07-08 17:21:13 +03:00

r

Merge branch '5.5' into 5.5-galera

2015-02-18 17:15:57 -05:00

t

Fix test failures on innodb-mdev-7055 and innodb-mdev-7513.

2015-02-10 14:17:23 +02:00

disabled.def

merge with mysql-5.5.30 minus few incorrect or not applicable changesets

2013-02-28 18:42:49 +01:00