VilhoRaatikka 0b89245a4b Merge branch 'develop' into MAX-167 ...

Conflicts:
	server/modules/monitor/mysql_mon.c
	server/modules/routing/readwritesplit/readwritesplit.c

2014-06-30 14:17:00 +03:00

..

test

Merge branch 'master' into blr

2014-05-19 13:46:47 +01:00

.gitignore

Updated gitignore files

2014-02-05 14:49:05 +01:00

adminusers.c

Surrounded every log writing command with LOGIF macro, which tests if the given logfile id matches with those enabled. The comparison is done against local variable and expensive function call is avoided.

2013-12-12 16:14:33 +02:00

atomic.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00

buffer.c

Added mechanism for choosing slave for a query based on the current load in all connected slaves. Counting operations is not correctly done here. Reading values and choosing accordingly is done.

2014-06-29 22:21:30 +03:00

config.c

Implementation of server routing generic functionality and for readconnrouter

2014-06-27 12:07:47 +01:00

dbusers.c

Snapshot of failure tolerance changes.

2014-06-06 23:32:04 +03:00

dcb.c

Added server pending states in monitor

2014-06-27 13:38:35 +02:00

filter.c

Add support for #!../maxadmin scripts

2014-06-25 10:00:59 +01:00

gateway.c

write MaxScale PID into pidfile

2014-06-29 17:53:25 +02:00

gw_utils.c

Merge branch 'develop' into MAX-11

2014-06-16 19:53:19 +03:00

gwbitmask.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00

hashtable.c

Added checks for possible handle hashtable_add() failure

2014-02-14 10:49:06 +01:00

load_utils.c

Merge branch 'develop' into MAX-111

2014-06-26 16:52:57 +01:00

Makefile

Addition of the module utilities functions

2014-06-04 18:34:24 +01:00

maxkeys.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

maxpasswd.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

modutil.c

Support for multipacket statements

2014-06-24 17:59:29 +01:00

monitor.c

Merge of new user interface changes

2014-06-27 09:57:39 +01:00

poll.c

Snapshot of failure tolerance changes.

2014-06-06 23:32:04 +03:00

secrets.c

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

2014-05-27 17:07:41 +03:00

server.c

Merge branch 'develop' into MAX-167

2014-06-30 14:17:00 +03:00

service.c

Merge branch 'develop' into MAX-90

2014-06-27 12:15:30 +01:00

session.c

Merge branch 'develop' into MAX-99

2014-06-25 17:50:29 +03:00

spinlock.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

thread.c

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

users.c

Files updated for user@host mysql auth

2014-02-28 15:47:11 +01:00

utils.c

Fixed comments to be compatible with doxygen

2013-12-13 19:11:10 +02:00