Martin Brampton 4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122 ...

Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c

2015-06-19 23:12:54 +01: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

Merge branch 'blr' into develop

2015-02-03 17:19:06 +00:00

dbusers.h

Add saving of hashtables to a file

2015-02-06 11:44:29 +00:00

dcb.h

Merge remote-tracking branch 'origin/develop' into MXS-122

2015-06-19 23:12:54 +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

Moved default file search paths to gwdirs.h which is configured by CMake from gwdirs.h.in.

2015-04-27 04:48:50 +03:00

gwbitmask.h

Updated the licensing year from 2013 to 2013-2014

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

gwdirs.h.in

Fixed init.d and systemd scripts.

2015-06-16 14:20:53 +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

Added percentage conversion functions to maxconfig.h

2015-04-16 21:51:19 +03: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

Updated old references to MAXSCALE_HOME

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

modutil.h

Merge branch 'develop' into MAX-324

2015-03-09 10:18:59 +02:00

monitor.h

Moved common monitor functionality to the MONITOR type

2015-05-09 04:47:17 +03:00

notification.h

Added a configurable frequecy for the feedback task.

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

poll.h

Addition of show eventtimes and /events/times URL to maxinfo

2015-02-20 11:53:47 +00: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

Complementary fix to #694,http://bugs.mariadb.com/show_bug.cgi?id=694

2015-01-17 22:40:52 +02: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 remote-tracking branch 'origin/develop' into MXS-122

2015-06-19 23:12:54 +01:00

service.h

Removed SSLv2 methods from serviceInitSSL because OpenSSL 1.1.0 does not support them.

2015-06-17 10:24:02 +03:00

session.h

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

spinlock.h

Updated the licensing year from 2013 to 2013-2014

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

test_utils.h

Removed stdout printing of useless messages from maxkeys and maxpasswd.

2015-05-06 21:00:43 +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