Nirbhay Choubey af651c80f7 Merge tag 'mariadb-10.0.17' into 10.0-galera ...

Conflicts:
	storage/innobase/include/trx0trx.h

2015-02-27 17:36:54 -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-6490: mysqldump unknown option --galera-sst-mode

2014-08-07 18:29:20 -04: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

bzr merge -rtag:mariadb-10.0.15 maria/10.0

2014-12-05 12:33:02 -05:00

mysql.cc

5.5.40+ merge

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

mysqladmin.cc

5.5.39 merge

2014-08-07 18:06:56 +02:00

mysqlbinlog.cc

MDEV-6703 Add "mysqlbinlog --binlog-row-event-max-size" support

2015-02-24 15:55:00 +01:00

mysqlcheck.c

Merge branch '10.0' into 10.0-galera

2015-02-18 18:07:45 -05:00

mysqldump.c

MDEV-7615: Remove --galera-sst-mode option from mysqldump

2015-02-20 17:51:33 -05:00

mysqlimport.c

fix main.mysqldump test failing after Mroonga merge.

2014-10-05 22:07:19 +02:00

mysqlshow.c

10.0-base merge

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

mysqlslap.c

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

2014-09-30 20:31:14 +03: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