23 Commits

Author SHA1 Message Date
Markus Makela
d3da98b58f Merge branch 'MXS-544' into develop-MXS-544-merge 2016-03-03 21:39:39 +02:00
Johan Wikman
cb3213af63 server/include/poll.h renamed to server/include/maxscale/poll.h
Due to an include conflict between /usr/include/poll.h and
maxscale/server/include/poll.h the latter was moved to
maxscale/server/include/maxscale/poll.h.

Once 1.4 is out, all maxscale header files will be moved to that
same sub-directory. That will prevent include conflicts and also
make it easy to see which include files belong to maxscale and
which do not.
2016-03-01 12:56:39 +02:00
counterpoint
395cbdc103 Simplify handling of "client data" by having a pointer to it only in DCB and not in session structure. Change name of session->client to session->client_dcb for greater clarity. Temporary free of client data in DCB, to be moved to authenticator when it becomes a module. Fix incorrect name of listener_alloc. 2016-02-23 11:13:21 +00:00
Johan Wikman
1b8719ffed LOGIF removed from maxinfo. 2015-11-17 12:50:15 +02:00
Johan Wikman
a355e1beef Printf format checking added to logging function.
Printf format checking added to logging function and all
issues that were revealed by that fixed.
2015-11-16 12:40:49 +02:00
Markus Makela
6b88b6b17f Merge branch 'develop' into MXS-329-develop-20151111 2015-11-13 07:48:59 +02:00
Markus Makela
30d1fc66b7 getCapabilities no longer takes arguments and returns an int. 2015-11-11 18:14:03 +02:00
Markus Makela
264944ff23 Service users are set to NULL after they are freed. 2015-11-11 18:02:01 +02:00
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
Johan Wikman
834a88aeda Log variables moved to log_manager.h
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
counterpoint
f6916a23bd Move responsibility for closing DCB on error to router error handling. Check that routers remove or disable links to closed DCB. 2015-09-09 09:33:00 +01:00
counterpoint
986c918d52 Remove ERRACT_RESET action from router error handler; remove sole call from mysql_client. Correct comments on parameters for router error handlers. 2015-09-09 08:31:59 +01:00
Markus Makela
8a362d6668 Fixed memory leaks in maxinfo.c and httpd.c 2015-08-21 08:08:45 +03:00
MassimilianoPinto
6d140494f2 Extended support for select UNIX_TIMESTAMP
Extended support for select UNIX_TIMESTAMP
2015-03-12 15:19:52 +01:00
Markus Makela
ea039dd01a Fixed to Coverity defects and a fix to tee filter not compiling with SS_DEBUG flag. 2015-03-07 06:00:01 +02:00
MassimilianoPinto
4701604965 Added service user to mysql_users
Added service user to mysql_users

    [MaxInfo]
    type=service
    router=maxinfo
    user=monitor
    passwd=EBD2F49C3B375812A8CDEBA632ED8BBC
2015-02-27 12:20:00 +01:00
MassimilianoPinto
54ee63cade Added set autocommit handling
Added set autocommit handling
2015-02-26 19:12:33 +01:00
Mark Riddoch
7375725cc5 Addition of comment regarding users 2015-02-20 14:31:55 +00:00
Mark Riddoch
dd843784e8 Fix for /sessions URI and addition of /clients URI 2015-02-20 14:04:16 +00:00
Mark Riddoch
a022775342 Addition of show eventtimes and /events/times URL to maxinfo 2015-02-20 11:53:47 +00:00
Mark Riddoch
8eb14235d1 Addition of DCB and Poll statistics in show status output 2015-02-20 10:05:50 +00:00
Mark Riddoch
df3a548be1 Added basic REST interface to maxinfo plugin 2015-02-19 16:24:30 +00:00
Mark Riddoch
8e941f7523 Addition of the MaxInfo filter and the generic MaxScale resultset 2015-02-18 17:25:13 +00:00