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

..

yassl

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

2015-02-11 23:50:40 +01:00

charset2html.c

Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 15:53:48 +01:00

CMakeLists.txt

Updated/added copyright headers.

2013-02-25 15:26:00 +01:00

comp_err.c

mysql-5.5.33 merge

2013-09-06 22:31:30 +02:00

innochecksum.c

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

my_print_defaults.c

MDEV#5812 Memory leaks while running mysqld in

2014-03-11 23:12:18 -04:00

mysql_waitpid.c

5.3 merge

2012-01-13 15:50:02 +01:00

perror.c

MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error in include/my_global.h

2013-09-09 19:31:29 +02:00

replace.c

mysql-5.5.41 merge

2014-12-19 11:35:44 +01:00

resolve_stack_dump.c

5.3 merge

2012-01-13 15:50:02 +01:00

resolveip.c

MDEV-419 ensure that all HAVE_XXX constants can be set by cmake

2012-07-31 19:29:07 +02:00