Mark Riddoch 63252e94f2 Merge branch 'release-1.0beta-refresh' into blr ...

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

2014-09-24 16:49:12 +01:00

..

test

fixed double linking of the embedded library in a statically built internal library

2014-09-20 20:24:04 +03:00

.gitignore

gitignore cleanup

2014-08-18 09:39:29 +00: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

buffer.c:gwbuf_consume: rval may also be NULL, thus, added that to assert condition.

2014-09-11 15:27:31 +03:00

CMakeLists.txt

fixed double linking of the embedded library in a statically built internal library

2014-09-20 20:24:04 +03:00

config.c

Bug 546 - use of weghtby causes entry in error log

2014-09-19 15:52:44 +01:00

dbusers.c

Fixed memory leak in getUsers bug 439

2014-09-15 15:53:09 +02:00

dcb.c

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

filter.c

Fix bug 528 - wrong service name in tee fitler crashes MaxScale

2014-09-09 08:50:15 +01:00

gateway.c

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

2014-09-23 11:26:15 +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 from Z3

2014-09-11 12:51:16 +02:00

hint.c

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

2014-09-23 11:26:15 +03:00

housekeeper.c

Some general tidyup plus addition of code to block zombie processing

2014-09-19 10:50:54 +01:00

load_utils.c

Misc fixes to doxygen comments

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

Makefile

Merge from Z3

2014-09-11 12:51:16 +02: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

Fix for message length in COM_QUERY

2014-09-24 11:15:33 +01:00

monitor.c

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

2014-09-23 11:26:15 +03:00

poll.c

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

secrets.c

Jira bug MAX-248 File descriptor leak in secrets key reading

2014-09-10 08:06:48 +01:00

server.c

Fixed missue \n in list servers command

2014-09-12 17:32:31 +01:00

service.c

code cleanup localhost_match_wildcard_host

2014-09-12 17:21:34 +02:00

session.c

Fix for bug 539

2014-09-12 15:29:48 +01:00

spinlock.c

Changed SPINLOCK_PROFILE back to #if so that defining SPINLOC_PROFILE 0 turns

2014-09-15 09:38:58 +01: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