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

..

async_example.c

MWL#192: non-blocking client API, after-review fixes.

2012-01-06 12:43:18 +01:00

client_priv.h

MDEV-4297 mysql --binary-mode

2013-06-10 21:45:30 +02:00

CMakeLists.txt

Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG

2014-10-13 09:52:28 +02:00

completion_hash.cc

Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 13:29:12 +01:00

completion_hash.h

Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

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

echo.c

Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

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

get_password.c

mysql-5.5.32 merge

2013-07-16 19:09:54 +02:00

my_readline.h

MDEV-4297 mysql --binary-mode

2013-06-10 21:45:30 +02:00

mysql_plugin.c

MySQL-5.5.36 merge

2014-02-17 11:00:51 +01:00

mysql_upgrade.c

MDEV-5786: mysql_upgrade on galera replicates "alter table" on

2014-07-10 12:51:34 -04:00

mysql.cc

mysql-5.5.40

2014-10-06 19:53:55 +02:00

mysqladmin.cc

mysql-5.5.39 merge

2014-08-02 21:26:16 +02:00

mysqlbinlog.cc

mysql-5.5.41 merge

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

mysqlcheck.c

Merge branch '5.5' into 5.5-galera

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

mysqldump.c

mysql-5.5.39 merge

2014-08-02 21:26:16 +02:00

mysqlimport.c

Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5.

2014-01-22 15:16:57 +02:00

mysqlshow.c

Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5.

2014-01-22 15:16:57 +02:00

mysqlslap.c

Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5.

2014-01-22 15:16:57 +02:00

mysqltest.cc

Fixed yet another compiler warning.

2014-12-19 23:42:22 +04:00

readline.cc

MDEV-4297 mysql --binary-mode

2013-06-10 21:45:30 +02:00

sql_string.cc.dontuse

mysql-5.5.31 merge

2013-05-07 13:05:09 +02:00

sql_string.h.dontuse

mysql-5.5.32 merge

2013-07-16 19:09:54 +02:00