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

Conflicts:
	server/core/dcb.c
	server/modules/include/blr.h
	server/modules/routing/binlog/STATUS
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c

2014-06-08 00:50:36 +01:00

..

test

Merge branch 'master' into blr

2014-05-19 13:46:47 +01:00

.gitignore

Updated gitignore files

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

adminusers.c

Surrounded every log writing command with LOGIF macro, which tests if the given logfile id matches with those enabled. The comparison is done against local variable and expensive function call is avoided.

2013-12-12 16:14:33 +02:00

atomic.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00

buffer.c

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

config.c

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

dbusers.c

Tried explicitly access NULL pointer.

2014-05-30 11:32:37 +03:00

dcb.c

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

filter.c

Fix for unintialised structure member

2014-06-05 16:24:05 +01:00

gateway.c

Fixed two bugs of which one was older.

2014-04-28 23:33:49 +03:00

gw_utils.c

Added return code to setipaddress and removed fprintfs

2014-02-14 12:27:33 +01:00

gwbitmask.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00

hashtable.c

Added checks for possible handle hashtable_add() failure

2014-02-14 10:49:06 +01:00

load_utils.c

Addition of API modinfo implementation for filters

2014-06-02 18:18:31 +01:00

Makefile

Addition of the module utilities functions

2014-06-04 18:34:24 +01:00

maxkeys.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

maxpasswd.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

modutil.c

Fix for compiler warnings

2014-06-05 15:26:57 +01:00

monitor.c

new monitor routines

2014-05-28 15:44:51 +02:00

poll.c

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

secrets.c

Fix to bug #438 http://bugs.skysql.com/show_bug.cgi?id=438

2014-05-27 17:07:41 +03:00

server.c

Add server maintenance mode.

2014-06-03 09:25:09 +01:00

service.c

Added check for NULL pointer in serviceClearRouterOptions.

2014-06-05 20:17:39 +03:00

session.c

Addition of session filter tracking in order to allow the show session

2014-06-02 10:56:50 +01:00

spinlock.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

thread.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

users.c

Files updated for user@host mysql auth

2014-02-28 15:47:11 +01:00

utils.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00