Commit Graph

801 Commits

Author SHA1 Message Date
bf9d417187 Log message change for DISCONNECT SERVER
Log message change for DISCONNECT SERVER
2015-03-17 18:14:48 +01:00
fc6dd0a0a9 Added support for MariaDB 10.0 2015-03-17 12:04:11 +02:00
c1f3656790 Removed spinlock_release
Removed spinlock_release
2015-03-17 09:03:26 +01:00
6fdc7339f9 More logging information for schemarouter about router state. 2015-03-13 06:06:34 +02:00
57fc4696f2 Fixed missing session lock in schemarouter. 2015-03-13 03:33:37 +02:00
8d0ca74b9c Merge branch 'schemarouter_fix' into develop 2015-03-12 20:13:11 +02:00
5fa4e3299b Fixed schemarouter not storing queries received before database mapping was done. 2015-03-12 20:03:49 +02:00
b6cc739044 Fix to blr_file. 2015-03-12 18:37:07 +02:00
6d140494f2 Extended support for select UNIX_TIMESTAMP
Extended support for select UNIX_TIMESTAMP
2015-03-12 15:19:52 +01:00
90875c1164 Cleaned up unused variables. 2015-03-11 18:12:18 +02:00
63d83cd85d Monitor API 2.0.0 implemented. 2015-03-11 15:18:55 +02:00
fbedad84af Fixes to Coverity defects. 2015-03-10 17:08:04 +02:00
7af2843bcb Notification Service integration added
Notification Service integration added
2015-03-09 18:06:16 +01:00
683bb5a818 Removed the failure of authentication benchmark tests. 2015-03-09 14:18:16 +02:00
5471d35524 Merge branch 'develop' into MAX-324
Conflicts:
	server/include/modutil.h
2015-03-09 10:18:59 +02:00
f5d9c1e6df Fixes to Coverity defects. 2015-03-09 10:12:01 +02:00
8490f52dd0 Merge branch 'develop' into MAX-348 2015-03-09 09:07:30 +01:00
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
6766c0b883 Added statistics to backend references. 2015-03-06 17:41:39 +02:00
282f66f9fd Merge branch 'develop' into MAX-324
Conflicts:
	utils/skygw_utils.cc
2015-03-06 17:07:39 +02:00
8cfd368e6b Added more diagnostic output. 2015-03-06 17:06:09 +02:00
5bbd9a66fc Added show feedbackreport
Added show feedbackreport
2015-03-06 11:15:06 +01:00
c937568624 Fixed a possible memory leak when session command history limits are used. 2015-03-05 20:46:55 +02: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
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