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

..

test

Merge branch 'blr' into develop

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

.gitignore

gitignore cleanup

2014-08-18 09:39:29 +00:00

adminusers.c

Session-specific logging. Added functions

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

atomic.c

Modify atomic_add to use built in GCC function where available. Correct comments.

2014-10-17 14:10:16 +01:00

buffer.c

Session-specific logging. Added functions

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

CMakeLists.txt

Merge branch 'blr' into develop

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

config.c

Merge branch 'blr' into develop

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

dbusers.c

Session-specific logging. Added functions

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

dcb.c

Merge branch 'blr' into develop

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

filter.c

Session-specific logging. Added functions

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

gateway.c

Merge branch 'blr' into develop

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

gw_utils.c

Session-specific logging. Added functions

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

gwbitmask.c

Fix two other incorrect pointers, changing bitmask to bitmask->bits.

2014-11-05 09:29:21 +00:00

hashtable.c

Coverity 72692

2014-10-30 17:16:59 +01:00

hint.c

Fix to bug #587, http://bugs.mariadb.com/show_bug.cgi?id=587

2014-10-23 21:03:58 +03:00

housekeeper.c

Merge branch 'blr' into develop

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

load_utils.c

Merge branch 'blr' into develop

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

Makefile

Merge branch 'blr' into develop

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

maxkeys.c

Updated the licensing year from 2013 to 2013-2014

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

maxpasswd.c

Fixes to Coverity errors:

2014-11-07 10:57:11 +02:00

memlog.c

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

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

modutil.c

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

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

monitor.c

Session-specific logging. Added functions

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

poll.c

Merge branch 'blr' into develop

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

secrets.c

Session-specific logging. Added functions

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

server.c

Session-specific logging. Added functions

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

service.c

Session-specific logging. Added functions

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

session.c

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

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

spinlock.c

Minor changes to tests; fix typo; tidy up.

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

thread.c

Updated the licensing year from 2013 to 2013-2014

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

users.c

Update to users_delete bug 582

2014-10-22 17:07:00 +01:00

utils.c

Session-specific logging. Added functions

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