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

..

.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

Hopefully final tidy up.

2015-06-23 14:58:53 +01:00

buffer.h

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

dbusers.h

Fix to MXS-417: https://mariadb.atlassian.net/browse/MXS-417 Added support for single-character wildcard in IP addresses.

2015-11-03 10:15:34 +02:00

dcb.h

Add dcb_hangup_foreach to DCB header.

2015-10-17 20:09:05 +01:00

externcmd.h

Renamed mon_exec files to externcmd.

2015-05-18 18:34:43 +03:00

filter.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

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

gw.h

Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436

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

gwbitmask.h

User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks.

2015-10-17 20:00:05 +01:00

gwdirs.h.in

The datadir path is now used as the location where the process specific data directories are created.

2015-09-03 19:30:16 +03:00

hashtable.h

Added a warning about multiple monitors monitoring the same servers.

2015-05-05 13:45:24 +03:00

hint.h

Renamed all occurences of SkySQL to MariaDB Corporation

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

hk_heartbeat.h

Moved the housekeeper heartbeat to a separate header for ease of integration.

2015-02-24 05:00:16 +02:00

housekeeper.h

Moved the housekeeper heartbeat to a separate header for ease of integration.

2015-02-24 05:00:16 +02:00

maxconfig.h

Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4

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

maxscale_pcre2.h

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

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

maxscale.h

Added a check for running MaxScale processes.

2015-08-25 15:20:10 +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

Updated old references to MAXSCALE_HOME

2015-04-27 15:06:45 +03:00

modutil.h

Fix to MXS-29: https://mariadb.atlassian.net/browse/MXS-29

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

monitor.h

Service are not started if user permissions are inadequate.

2015-08-28 12:54:38 +03:00

notification.h

Added a configurable frequecy for the feedback task.

2015-03-11 06:51:55 +02:00

poll.h

User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks.

2015-10-17 20:00:05 +01:00

random_jkiss.h

Correct small mistake

2015-08-26 16:30:08 +01:00

rdtsc.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

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

resultset.h

Fixed bug in resultset_make_row

2015-02-19 11:06:31 +00:00

router.h

Change binlog router to indicate it does not use router sessions via the getCapabilities interface.

2015-10-27 14:17:06 +00:00

secrets.h

Fix to MXS-125: https://mariadb.atlassian.net/browse/MXS-125

2015-06-16 17:10:00 +03:00

server.h

Merge branch 'develop' into 1.2.1-binlog_router

2015-08-04 07:59:44 -04:00

service.h

Fix to MXS-54: https://mariadb.atlassian.net/browse/MXS-54

2015-11-04 09:18:20 +02:00

session.h

Improve user name setting in DCB for persistent connections and to fix bug; change name of session_alloc_dummy to session_set_dummy to be more informative.

2015-08-28 18:20:32 +01:00

spinlock.h

Updated the licensing year from 2013 to 2013-2014

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

test_utils.h

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

2015-11-06 14:20:05 +02: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 more details to log output when MaxScale receives a fatal signal.

2015-09-01 10:11:20 +03:00