counterpoint dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111 ...

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

2015-11-11 11:08:02 +00:00

..

CMakeLists.txt

Fixed queries without assignment operators failing to be properly canonized.

2015-10-27 14:20:43 +02:00

skygw_debug.h

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

skygw_types.h

Fixes to Coverity defects 85010 84878 72752 72742 72719 and 73418.

2015-01-05 06:05:56 +02:00

skygw_utils.cc

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

skygw_utils.h

maxscale_getline moved to config.c

2015-10-30 09:38:40 +02:00