Markus Makela 15a96f037d Merge remote-tracking branch 'origin/MAX-324' into MAX-324 ...

Conflicts:
	server/modules/routing/dbshard/dbshard.c

2014-12-07 06:11:24 +02:00

..

binlog

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

dbshard

Merge remote-tracking branch 'origin/MAX-324' into MAX-324

2014-12-07 06:11:24 +02:00

readwritesplit

query_classifier.cc:cleaned up some intendentions and brackets.

2014-12-07 00:34:23 +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

Added functions that query backend servers for database names

2014-12-01 14:27:33 +02: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