Mark Riddoch d3c8770852 Merge branch 'blr' into develop ...

Conflicts:
	client/maxadmin.c
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/core/gateway.c
	server/core/poll.c
	server/core/test/CMakeLists.txt
	server/core/test/makefile
	server/include/poll.h
	server/modules/routing/debugcmd.c

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

..

.gitignore

Updated gitignore files

2014-02-05 14:49:05 +01:00

adminusers.h

Updated the licensing year from 2013 to 2013-2014

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

atomic.h

Updated the licensing year from 2013 to 2013-2014

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

buffer.h

Minor modifications for testing.

2014-10-03 17:24:46 +01:00

config.h

Merge branch 'blr' into develop

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

dbusers.h

MySQL Auth with dbname check

2014-10-16 19:17:15 +02:00

dcb.h

Merge branch 'blr' into develop

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

filter.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

gw.h

Removed compile warning for setipaddress

2014-10-23 17:49:59 +02:00

gwbitmask.h

Updated the licensing year from 2013 to 2013-2014

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

hashtable.h

Updated the licensing year from 2013 to 2013-2014

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

hint.h

Renamed all occurences of SkySQL to MariaDB Corporation

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

housekeeper.h

Merge branch 'blr' into develop

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

maxscale.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

memlog.h

Added the ability to have a non-auto-flushing memlog. Flush is then a

2014-10-14 11:40:23 +01:00

modinfo.h

Renamed all occurences of SkySQL to MariaDB Corporation

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

modules.h

Merge branch 'blr' into develop

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

modutil.h

Bug 551 - added new routine to return NULL terminated query text

2014-11-06 17:59:20 +00:00

monitor.h

Addition of timeout for connect,read,write

2014-11-10 15:13:26 +01:00

poll.h

Merge branch 'blr' into develop

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

rdtsc.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

router.h

Updated the licensing year from 2013 to 2013-2014

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

secrets.h

Updated the licensing year from 2013 to 2013-2014

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

server.h

Disable Master failback in Galera Monitor

2014-10-30 18:41:30 +01:00

service.h

Added db names as hashtable

2014-10-20 19:26:13 +02:00

session.h

Added commands to debugcmd.c that enable and disable logs for a single session.

2014-11-19 12:25:33 +02:00

spinlock.h

Updated the licensing year from 2013 to 2013-2014

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

thread.h

Updated the licensing year from 2013 to 2013-2014

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

users.h

Updated the licensing year from 2013 to 2013-2014

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

version.h.in

added the missing version.h template file

2014-09-11 20:19:10 +03:00