Sergei Golubchik 928edb5a91 Merge branch '5.5' into 10.0 ...

5.5 without InnoDB/XtraDB changes

2015-08-05 09:45:17 +02:00

..

async_example.c

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

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

client_priv.h

post-merge fixes

2015-04-29 12:40:52 +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

MDEV-5120 Test suite test maria-no-logging fails

2014-09-30 20:31:14 +03:00

mysql_upgrade.c

Merge commit '96badb16afcf' into 10.0

2015-08-03 23:09:43 +03:00

mysql.cc

5.5.40+ merge

2014-10-09 10:30:11 +02:00

mysqladmin.cc

Merge branch '5.5' into 10.0

2015-05-04 22:00:24 +02:00

mysqlbinlog.cc

MDEV-8340 Add "mysqlbinlog --binlog-row-event-max-size" support for MariaDB 5.5

2015-07-31 17:17:33 +02:00

mysqlcheck.c

Merge branch '5.5' into 10.0

2015-06-11 20:20:35 +02:00

mysqldump.c

MDEV-8183 Adding option mysqldump --no-data-med

2015-06-16 23:58:05 +02:00

mysqlimport.c

MDEV-7429 main.mysqldump fails sporadically in buildbot

2015-07-27 10:52:21 +02:00

mysqlshow.c

10.0-base merge

2014-02-03 15:22:39 +01:00

mysqlslap.c

Merge branch '5.5' into 10.0

2015-08-05 09:45:17 +02:00

mysqltest.cc

MDEV-7871 Tests fail massively on "Assertion `status_var.memory_used == 0'" when run with --ps --embedded.

2015-06-15 18:07:41 +05: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