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

..

CMakeLists.txt

Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.

2014-09-20 19:44:30 +03:00

httpd.c

Revert "Implementation of HTTPD protocol, gwbuf properties and a dmeo web application"

2014-07-15 17:53:39 +01:00

Makefile

consistently use DEL instead of rm in Makefiles

2014-08-17 21:02:24 +00:00

maxscaled.c

Fix for double free if incorrect password is passed

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

mysql_backend.c

gwbuf_append's return value wasn't read in gw_read_client_event

2014-09-12 18:10:42 +03:00

mysql_client.c

Add initial file number

2014-09-19 13:40:38 +01:00

mysql_common.c

Add initial file number

2014-09-19 13:40:38 +01:00

telnetd.c

Update plugin status to BETA

2014-07-04 09:23:40 +01:00