22849f7c90
Added support for multiple result sets.
2015-03-06 22:40:10 +02:00
2aaa367c37
Merge branch 'develop' into tee_fixes
2015-03-06 18:27:41 +02:00
282f66f9fd
Merge branch 'develop' into MAX-324
...
Conflicts:
utils/skygw_utils.cc
2015-03-06 17:07:39 +02:00
5bbd9a66fc
Added show feedbackreport
...
Added show feedbackreport
2015-03-06 11:15:06 +01:00
e952db0ee9
Notification server integration
...
Notification server integration: added proper logging to errors
Added “enable/disable feedback” via maxadmin/telnet
2015-03-05 18:58:07 +01:00
698af9d3b7
Send modules list into to Notification server
...
Send modules list into to Notification server
TODO: remove fprintf in module_feedback_send and use log manager
instead
2015-03-05 13:20:22 +01:00
bb2609e161
Merge branch 'develop' into MAX-348
2015-03-05 12:59:44 +01:00
1299cf6ac9
Fixed hktask_add not comparing task names if there was only a single task.
2015-03-05 12:41:09 +02:00
1ff0756044
Added a command line option for syslog logging.
2015-03-05 12:37:39 +02:00
d98dd6e15f
Fixing errors caused by the merge with develop.
2015-03-05 11:14:12 +02:00
880adca73e
Merge branch 'develop' into MAX-324
2015-03-05 10:45:48 +02:00
0dd63ceaf1
Added release version string function to config.c
2015-03-04 18:48:38 +02:00
bc5dfe82c2
merge from develop
...
merge from develop
2015-03-04 17:02:04 +01:00
1b0fd4576a
Merge branch 'maxinfo' into develop
...
Conflicts:
server/core/service.c
server/core/session.c
server/include/session.h
2015-03-04 11:33:00 +02:00
3b76ed43c4
Added tee filter multi-statement support.
2015-03-04 04:20:46 +02:00
692dd79235
Added binary protocol COM_STMT_PREPARE to modutil_get_SQL.
2015-03-03 14:42:55 +02:00
7427afeb65
Added configuration parameters
...
Added configuration parameters and feedback_setup_info creation
2015-03-03 10:25:44 +01:00
74e303f601
Fixed routine name
...
Fixed routine name
2015-03-02 17:36:00 +01:00
64c0b7b041
Notification service support
...
Notification service support
2015-03-02 17:15:31 +01:00
a384f63485
Merge branch 'develop' into MAX-348
2015-03-02 16:39:37 +01:00
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
193fe22ef0
Addition of module_feedback_send
...
Addition of module_feedback_send.
Every 30 second data is sent to 127.0.0.1
Missing routines for configuration parameters and blocking the send
after successful completion
2015-02-26 17:47:01 +01:00
b897c7da80
Revert "Logfiles are now writted to file instead of shared memory as a default."
...
This reverts commit 2477043d11bde7a2dd28ff9c5535e0b121ff8105.
2015-02-26 15:54:06 +02:00
63e6826906
Added find_package calls for libcurl and linked the maxscale executable against it.
2015-02-26 11:16:50 +02:00
ad49c5f402
Added optional millisecond precision to logfiles and created the changelog document.
2015-02-24 18:10:16 +02:00
3b29e1a1f0
Fixed merging conflicts.
2015-02-24 06:34:22 +02:00
9e7afeb302
Merge branch 'develop' into MAX-324
...
Conflicts:
macros.cmake
server/core/config.c
server/core/service.c
server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
5477cdf5eb
Renamed the dbshard module to schemarouter.
2015-02-24 05:49:38 +02:00
aa4932bf2d
Moved the housekeeper heartbeat to a separate header for ease of integration.
...
This keeps the behavior the same but allows the heartbeat to be used as a crude timer
without including everything the housekeeper.h header includes.
Moved the protocol level updates on the DCBs last_read value into dcb_read.
This keeps the implementation nice and compact.
2015-02-24 05:00:16 +02:00
57f89f5689
Small optimizations to session timeouts.
2015-02-23 19:59:36 +02:00
578fb07370
Added timeout testing to service tests.
2015-02-23 11:13:31 +02:00
56d810ff80
Merge branch 'develop' into timeout
2015-02-23 10:28:55 +02:00
46c4fefb00
Fixes to coverity defects 87601 87557 87548 87547 87546 87545 87544 87536 87535 87529 87528
2015-02-22 22:29:30 +02:00
1d74295e8c
Moved a function around.
2015-02-22 21:52:53 +02:00
c47d2f3791
Added session timeouts.
...
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
fc969acc73
Added optional stripping of escape characters from database names when laoding users.
2015-02-20 21:07:12 +02:00
83b7948cdf
Added more debug output to user authentication.
2015-02-20 14:50:26 +02:00
a022775342
Addition of show eventtimes and /events/times URL to maxinfo
2015-02-20 11:53:47 +00:00
2c401788ee
Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579
...
Added actual testing routers and protocols.
2015-02-20 12:30:55 +02:00
039d3c4c0b
Make JSON result sets produce nmeric valeus without quotes
...
Updated HTTPD protocol module to return application/json as the encoding
2015-02-20 10:09:01 +00:00
8eb14235d1
Addition of DCB and Poll statistics in show status output
2015-02-20 10:05:50 +00:00
ea55572ab8
Merge branch 'develop' into MAX-324
2015-02-20 04:45:48 +02:00
3924f70d6b
Fixed log manager sometimes not writing the last character in a log message.
...
This was caused by type conversions from int to size_t and the usage of the MAX macro.
2015-02-20 04:42:02 +02:00
df3a548be1
Added basic REST interface to maxinfo plugin
2015-02-19 16:24:30 +00:00
c2cd3f4c3d
Merge pull request #73 from tanji/serversjson
...
Output server list in JSON format
2015-02-19 16:56:02 +02:00
11e65f02f0
Addition of maxinfo show modules and show monitors commands
2015-02-19 13:32:48 +00:00
2f218cba3a
Addition of maxinfo commands
...
show sessions
show clients
show listeners
show services
show servers
2015-02-19 12:55:39 +00:00
b8b75b604f
Make JSON output valid
2015-02-19 13:55:29 +01:00
3898a995ad
Addition of show services command
2015-02-19 11:07:24 +00:00
e0e5652f5e
Fixed bug in resultset_make_row
...
Addition of resultset_stream_json
2015-02-19 11:06:31 +00:00
