MassimilianoPinto 63a7ccf520 Merge branch 'MAX-232' into 232-bis ...

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

2014-09-04 09:23:29 +02:00

..

test

Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

2014-08-29 16:21:08 +03:00

.gitignore

Updated gitignore files

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

adminusers.c

Fixed soem errors from a cppcheck run

2014-08-22 14:25:27 +01:00

atomic.c

Fixed comments to be compatible with doxygen

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

buffer.c

Merge branch 'Z3' of https://github.com/skysql/MaxScale into Z3

2014-08-29 18:50:32 +03:00

config.c

Fix for broken replication

2014-09-01 11:18:57 +02:00

dbusers.c

Merge branch 'MAX-237' into Z3

2014-09-02 16:58:20 +03:00

dcb.c

Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

2014-08-29 16:21:08 +03:00

filter.c

Fix for bug 479 - Undefined filter reference in MaxScale.cnf causes a crash

2014-08-22 14:33:14 +01:00

gateway.c

Fix to bug #510, http://bugs.skysql.com/show_bug.cgi?id=510, made every MaxScale thread to call mysql_thread_init() before entering poll_waitevents. Also main thread does this before starting services. Removed all calls to mysql_thread_init() and to mysql_thread_end() from elsewhere than from poll.c:poll_waitevents and from gateway.c:main

2014-09-01 19:37:31 +03: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

Merge branch 'MAX-237' into Z3

2014-09-03 17:50:56 +03:00

hint.c

Fix to bug #470, http://bugs.skysql.com/show_bug.cgi?id=470, in hint_dup: the value field of the duplicated hint was not set. Instead data field was set twice.

2014-08-07 00:14:15 +03:00

load_utils.c

Misc fixes to doxygen comments

2014-08-19 13:22:40 +01:00

Makefile

Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

2014-08-29 16:21:08 +03:00

maxkeys.c

moving files to /server to make merge possible

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

maxpasswd.c

Misc fixes to doxygen comments

2014-08-19 13:22:40 +01:00

modutil.c

Merge branch 'Z3' of https://github.com/skysql/MaxScale into Z3

2014-08-29 18:50:32 +03:00

monitor.c

Fix for broken replication

2014-09-01 11:18:57 +02:00

poll.c

Fix to bug #510, http://bugs.skysql.com/show_bug.cgi?id=510, made every MaxScale thread to call mysql_thread_init() before entering poll_waitevents. Also main thread does this before starting services. Removed all calls to mysql_thread_init() and to mysql_thread_end() from elsewhere than from poll.c:poll_waitevents and from gateway.c:main

2014-09-01 19:37:31 +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 'MAX-232' into 232-bis

2014-09-04 09:23:29 +02:00

service.c

Merge remote-tracking branch 'origin/MAX-160' into MAX-237

2014-08-29 11:02:03 +03:00

session.c

Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

2014-08-29 16:21:08 +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

Misc fixes to doxygen comments

2014-08-19 13:22:40 +01:00