Mark Riddoch e102d56e69 Merge branch 'blr' into release-1.0GA ...

Conflicts:
	server/modules/protocol/mysql_backend.c
	server/modules/routing/binlog/blr_master.c

2014-12-05 11:42:02 +00:00

..

binlog

Merge branch 'blr' into release-1.0GA

2014-12-05 11:42:02 +00:00

readwritesplit

Fix to bug 583 http://bugs.mariadb.com/show_bug.cgi?id=583

2014-12-03 19:41:06 +02:00

test

Fixed some typos and testing messages from CMake output.

2014-11-17 12:57:07 +02:00

cli.c

Session-specific logging. Added functions

2014-11-19 00:08:59 +02:00

CMakeLists.txt

Updates for new logging definitions

2014-12-04 16:56:33 +00:00

debugcli.c

Session-specific logging. Added functions

2014-11-19 00:08:59 +02:00

debugcmd.c

Changed the 'seslog' command to 'sessionlog' in the telnet client.

2014-11-19 16:55:18 +02:00

GaleraHACRoute.c

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

Makefile

Changed the order of linking in test_mysql_users and removed references to non-existing directories in test.inc

2014-10-23 15:24:59 +03:00

readconnroute.c

Session-specific logging. Added functions

2014-11-19 00:08:59 +02:00

testroute.c

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

webserver.c

Renamed all occurences of SkySQL to MariaDB Corporation

2014-09-30 13:02:10 +03:00