counterpoint dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111 ...

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

2015-11-11 11:08:02 +00:00

..

test

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

.gitignore

gitignore cleanup

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

adminusers.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +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

Add conditionally compiled mechanism to "show buffers" to give a list of the currently allocated buffers, with a trace for each one of the calls that led to its creation.

2015-11-11 09:03:48 +00:00

CMakeLists.txt

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

config.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

dbusers.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

dcb.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

externcmd.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

filter.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

gateway.c

Interface of skygw_logmanager_init(int argc, char* argv[]) changed.

2015-11-06 14:20:05 +02:00

gw_utils.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

gwbitmask.c

Remove stray character.

2015-10-17 20:02:59 +01:00

gwdirs.c

Partial merge of MXS-70

2015-08-10 17:33:40 +03:00

hashtable.c

Put extra check in hashtable_fetch to return if zero entries (should never happen but will crash if not checked); remove dcb_close from mysql_backend where it closes backend DCBs, as these should be closed by the router.

2015-10-07 17:06:21 +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

Fixed hktask_add not comparing task names if there was only a single task.

2015-03-05 12:41:09 +02:00

load_utils.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

maxkeys.c

Interface of skygw_logmanager_init(int argc, char* argv[]) changed.

2015-11-06 14:20:05 +02:00

maxpasswd.c

Interface of skygw_logmanager_init(int argc, char* argv[]) changed.

2015-11-06 14:20:05 +02:00

maxscale_pcre2.c

Added utility functions for regular expression matching with the PCRE2 library.

2015-10-31 10:34:37 +02:00

memlog.c

Fixed compiler warnings.

2015-07-14 17:13:09 +03:00

modutil.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

monitor.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

poll.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

random_jkiss.c

Changes to deal with failed session creation by keeping the new session in existence until all related DCBs have closed; minor changes in response to reviews.

2015-09-17 08:15:32 +01:00

resultset.c

Fixed to Coverity defects and a fix to tee filter not compiling with SS_DEBUG flag.

2015-03-07 06:00:01 +02:00

secrets.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

server.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

service.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

session.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00: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

Fixed possible NULL pointer dereference and out-of-bounds read in user hashtable comparison function.

2015-08-17 07:23:24 +03:00

utils.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00