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
e047247200
Add command to print all servers in JSON format
2015-02-19 10:07:31 +01:00
8e941f7523
Addition of the MaxInfo filter and the generic MaxScale resultset
2015-02-18 17:25:13 +00:00
65e2572ad0
Made config_truth_value non-static.
2015-02-18 13:16:06 +02:00
03456b931b
Added "yes" and "no" to the config truth value check and added the function to the header.
2015-02-18 11:45:01 +02:00
da029140cd
dcb_call_foreach now only calls the callbacks for those DCBs that are connected to the server.
2015-02-18 05:36:39 +02:00
ce063caf56
Fixed stopped monitors getting a call to monitorStop.
2015-02-17 21:47:11 +02:00
a2bff1dcea
Merge branch 'develop' into MAX-324
2015-02-16 14:58:35 +02:00
f54b57d987
Fixed modutil_replace_SQL not modifying the packet length when the replacement was shorter.
2015-02-16 12:10:48 +02:00
9dfa4378b4
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2015-02-16 09:21:38 +00:00
d7da8c5297
Code cleanup
2015-02-16 09:21:11 +00:00
cd99d6c1dd
Fixes to Coverity defects 87073, 87388.
2015-02-16 09:11:55 +02:00
37360eb02e
Merge pull request #72 from hholzgra/hartmut-warnings-2nd
...
"Hartmut warnings 2nd" merged.
2015-02-15 20:26:09 +02:00
eedcd44e95
wrong SPINLOCK type declaration (actual structure, not pointer, needed)
2015-02-14 16:51:03 +01:00
617f44c9c9
use intptr_t type for pointer->integer conversion so that int <-> pointer sizes match
2015-02-14 16:39:05 +01:00
3ecf926092
prevent signed/unsigned conflicts
2015-02-14 15:34:11 +01:00
3bad5dc814
Fixes to Coverity defects 87308, 87307, 87306, 87074, 87068.
2015-02-14 07:54:17 +02:00
2477043d11
Logfiles are now writted to file instead of shared memory as a default.
...
This can still be enabled while starting maxscale.
2015-02-13 23:59:32 +02:00
56ab0efbb3
include string.h for strdup() prototype
2015-02-13 17:06:47 +01:00
c992b53750
include stdlib.h for malloc() prototype
2015-02-13 17:03:39 +01:00
a3a7aae1d2
add missing return type for main()
2015-02-13 16:57:12 +01:00
6d1a11637a
Fixed typo
2015-02-13 10:18:55 +00:00
d1c2895057
Small fix to how user is retrieved from all servers.
...
When the authentication was done using the user data from all servers and the set of servers contained a server in the Master state it was possible that some servers weren't queried for their users. This was fixed by adding a check for the parameter that enables this before looking for a master server.
2015-02-13 07:34:46 +02:00
36363b09a1
Added more debug logging and fixed the service resources being overwritted even though they were already allocated.
2015-02-10 14:28:49 +02:00
46ec9abe29
Added optional parameters for services that allow all servers to be used when building the list of users.
2015-02-09 07:19:13 +02:00
0d4761ade8
Merge branch 'develop' into MAX-324
2015-02-06 23:27:59 +02:00
46c0c70764
Fixed negative values from hashing functions causing segmentation faults.
2015-02-06 22:59:47 +02:00
ba0d4ae29e
Addition of log message for zero users beign loaded.
2015-02-06 16:10:29 +00:00
d4f5ca6bcb
Merge branch 'blr' into develop
...
Addition of hashtable load and save. Caching of auth information
2015-02-06 11:52:51 +00:00
bc0d303b27
Add saving of hashtables to a file
...
Cache the user information to file in order to allow authentication without backend databases
2015-02-06 11:44:29 +00:00
98cbc34c6c
Fix for bug #714
...
Fix for bug #714
2015-02-06 11:26:48 +01:00
86bed0541c
Merge branch 'develop' into MAX-324
2015-02-04 13:01:43 +02:00
0083e62c41
Merge branch 'blr' into develop
2015-02-03 17:19:06 +00:00
ea88cea959
Merge branch 'develop' into MAX-324
2015-01-29 20:36:26 +02:00
21bb341c7d
Fix to bug #507 , http://bugs.mariadb.com/show_bug.cgi?id=507
...
readwritesplit.c:get_route_target routed query to slave although query type was combined QUERY_TYPE_READ | QUERY_TYPE_MASTER_READ, where the latter is supposed to be routed to master.
2015-01-27 15:21:31 +02:00
270c0ebf8a
Clean up, added comments, removed some dead code.
2015-01-27 10:24:37 +02:00
566831c9c5
Fix to bug 705: http://bugs.mariadb.com/show_bug.cgi?id=705
...
changed " to ' in queries so that ANSI_QUOTES works with sql_modes that use it.
2015-01-26 20:17:20 +02:00
7a55d482a2
Fix to bug 700: http://bugs.mariadb.com/show_bug.cgi?id=700
...
--version now prints the version string.
2015-01-26 10:19:25 +02:00
8791cc455e
Added the initial implementation of the shardrouter module.
2015-01-23 06:40:30 +02:00
db1ea422a0
Merge branch 'develop' into MAX-324
...
Conflicts:
server/core/modutil.c
2015-01-20 04:25:40 +02:00
5d1f029260
New fix candidate to bug #698 , http://bugs.mariadb.com/show_bug.cgi?id=698
...
client/test/maxadmin_test.sh: added new cases for testing maxadmin
service.c:dListListeners:fixed NULL-pointer reference
debugcli.h: replaced magic number 80 with constant integer.
cli.c:execute:fixed command buffer overflow
debugcmd.c:convert_arg:restored return value to 0 in case of error
2015-01-19 17:55:02 +02:00
9c34125a59
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2015-01-19 00:04:01 +02:00
