Markus Makela 1b0fd4576a Merge branch 'maxinfo' into develop ...

Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h

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

..

test

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

2015-02-24 05:00:16 +02: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

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

2015-01-02 18:32:57 +02:00

CMakeLists.txt

Addition of the MaxInfo filter and the generic MaxScale resultset

2015-02-18 17:25:13 +00:00

config.c

Added optional millisecond precision to logfiles and created the changelog document.

2015-02-24 18:10:16 +02:00

dbusers.c

Fixed typo

2015-02-13 10:18:55 +00:00

dcb.c

Merge branch 'maxinfo' into develop

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

filter.c

Fix to Bug #657, http://bugs.skysql.com/show_bug.cgi?id=657

2015-01-01 01:20:21 +02:00

gateway.c

Merge branch 'maxinfo' into develop

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

gw_utils.c

Improved error messages

2014-12-16 10:38:09 +00:00

gwbitmask.c

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

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

hashtable.c

Fixes to Coverity defects 87308, 87307, 87306, 87074, 87068.

2015-02-14 07:54:17 +02: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

Addition of maxinfo show modules and show monitors commands

2015-02-19 13:32:48 +00:00

maxkeys.c

add missing return type for main()

2015-02-13 16:57:12 +01:00

maxpasswd.c

Fixes to Coverity errors:

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

memlog.c

wrong SPINLOCK type declaration (actual structure, not pointer, needed)

2015-02-14 16:51:03 +01:00

modutil.c

Added binary protocol COM_STMT_PREPARE to modutil_get_SQL.

2015-03-03 14:42:55 +02:00

monitor.c

Merge branch 'maxinfo' into develop

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

poll.c

Merge branch 'maxinfo' into develop

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

resultset.c

Merge branch 'maxinfo' into develop

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

secrets.c

Fixes to Coverity defect 84478 and to 72759 which has reappeared.

2014-12-11 09:43:59 +02:00

server.c

Merge branch 'maxinfo' into develop

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

service.c

Merge branch 'maxinfo' into develop

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

session.c

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +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

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

2014-12-31 21:06:28 +02:00

utils.c

Added service user to mysql_users

2015-02-27 12:20:00 +01:00