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
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
04310ae60e
Fixed return code from slave reply routines
...
Fixed return code from slave reply routines
Fixed error reply packet len
2015-03-02 08:48:15 +01:00
2d08bc4eda
Fix to bug 736: http://bugs.mariadb.com/show_bug.cgi?id=736
...
Added a cofigurable limit on the number of session commands the readwritesplit router stores.
2015-03-01 02:27:47 +02: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
561952e1ea
Moved service definition to router_options for shardrouter.
2015-02-26 20:34:35 +02:00
54ee63cade
Added set autocommit handling
...
Added set autocommit handling
2015-02-26 19:12:33 +01:00
7a50e4be3d
Small addition to previous fix to session command error handling.
2015-02-24 13:46:05 +02:00
21a77736bf
Fixed session command error handling with backend DCBs that were already closed.
2015-02-24 13:44:01 +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
46c4fefb00
Fixes to coverity defects 87601 87557 87548 87547 87546 87545 87544 87536 87535 87529 87528
2015-02-22 22:29:30 +02:00
fc969acc73
Added optional stripping of escape characters from database names when laoding users.
2015-02-20 21:07:12 +02:00
120e65d4b8
Fixed a null pointer reference when grants were given to user's hostname but not MaxScale's hostname.
2015-02-20 19:12:59 +02:00
22255a6045
Removed extra ; in soem blr_make_query calls - this breaks parsing when
...
one maxscale is chained from another
2015-02-20 16:07:09 +00:00
ff57d22901
Merge branch 'maxinfo' of https://github.com/mariadb-corporation/MaxScale into maxinfo
2015-02-20 15:59:43 +00:00
d38e614f29
Removed extra ; from a few of the queries - this messes up chaining of MaxScale's
2015-02-20 15:58:46 +00:00
7375725cc5
Addition of comment regarding users
2015-02-20 14:31:55 +00:00
dd843784e8
Fix for /sessions URI and addition of /clients URI
2015-02-20 14:04:16 +00:00
7d07e5dd8a
Fixed bug in like clause matching
2015-02-20 12:36:24 +00: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
8eb14235d1
Addition of DCB and Poll statistics in show status output
2015-02-20 10:05:50 +00:00
7fc004ec28
Merge branch 'develop' into MAX-324
2015-02-20 10:18:45 +02:00
22f7137440
Fix to bug 600: http://bugs.mariadb.com/show_bug.cgi?id=600
...
readwritesplit now drops slave connections that fail a session command.
2015-02-20 06:38:38 +02:00
ea55572ab8
Merge branch 'develop' into MAX-324
2015-02-20 04:45:48 +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
eacd41d5da
Use plural for command
2015-02-19 13:57:02 +01:00
2f218cba3a
Addition of maxinfo commands
...
show sessions
show clients
show listeners
show services
show servers
2015-02-19 12:55:39 +00:00
3898a995ad
Addition of show services command
2015-02-19 11:07:24 +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
92e99ddfb7
Auto set router->masterid from master server-id
...
Automatically set router->masterid if not specified in the option: it’s
taken from master server-id
2015-02-18 11:04:50 +01:00
517524a8b4
Addition of DISCONNECT ALL and DISCONNECT SERVER
...
Addition of DISCONNECT ALL and DISCONNECT SERVER server_id
Added dbc_close in closeSession
Changed slave mode output display in diagnostics
2015-02-17 18:29:03 +01:00
dc65c9e1cc
Fix to bug 729: http://bugs.mariadb.com/show_bug.cgi?id=729
...
Prepared statements with a SELECT statement were falsely detected as SELECT queries with session variable modification.
This caused the error message and the failure to route the query.
2015-02-17 18:29:24 +02:00
865cd82fee
Addition of slave port and username in diagnostics
...
Addition of slave port and username in diagnostics
2015-02-17 11:32:41 +01:00
02e11b96b0
Changed references of dbshard into shardrouter in shardrouter.c
2015-02-17 12:14:48 +02:00
a2bff1dcea
Merge branch 'develop' into MAX-324
2015-02-16 14:58:35 +02:00
d91b6d375d
Added more documentation about functions and trace log output about users logging in with a default database.
2015-02-12 08:44:39 +02:00
a0a7dcdcfe
Fixed shardrouter possibly missing responses from the subservices if the session wasn't ready.
2015-02-10 20:36:53 +02:00
54eb3dd904
Fixed client hangups if the first response to a SHOW DATABASES query was sent too fast.
2015-02-10 16:07:50 +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
01eafd92c8
Fixed two errors in show slave status output. Master_UUID was
...
showing the variable name rather than the value and
Master_SSL_Verify_Server_cert was missing
2015-02-10 10:00:02 +00:00
d9139bb436
Added more tests for the dbshard router.
2015-02-10 10:49:54 +02:00
eafdd43592
Add Master_Server_Id value to returned show slave status command
2015-02-10 08:36:31 +00:00
faca6b6d76
Merge branch 'blr' into develop
2015-02-09 20:58:55 +00:00
