Commit Graph

668 Commits

Author SHA1 Message Date
9522d06f9b Tried explicitly access NULL pointer. 2014-05-30 11:32:37 +03:00
752f28ce48 Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-05-29 16:57:49 +01:00
3e17120105 Allow space for terminating NULL in args array 2014-05-29 16:57:17 +01:00
d19aedeb2c Merge branch 'develop' into feature-MAX-60 2014-05-29 12:12:05 +02:00
b761c798ca Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-05-29 09:01:44 +01:00
71bc2ba3ee set maxscale_id updated
set maxscale_id updated
2014-05-29 09:43:21 +02:00
4127c5397f Merge branch 'develop' into feature-MAX-60 2014-05-29 09:08:23 +02:00
b710025a8e printed message modified
printed message modified
2014-05-29 09:07:59 +02:00
f84e2b0dae Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-05-28 23:39:17 +01:00
797f044cf9 Addition of the list command to the debugcli to list servers,
services, listeners and sessions
2014-05-28 23:25:47 +01:00
c658c0fe9a Replication Lag parameter in diagnostics
Replication Lag parameter value is now printed in diagnostics routine
for MySQL monitor
2014-05-28 18:42:17 +02:00
b1e933f7ef Replication Lag in server diagnostics
Replication Lag in server diagnostics
2014-05-28 18:36:52 +02:00
5899fe0000 new parameters added for monitors
new parameters added for monitors
2014-05-28 18:11:07 +02:00
38b3368fe3 Merge branch 'develop' into feature-MX-60 2014-05-28 17:56:58 +02:00
4db9162bbc diagnostic routines updated
diagnostic routines updated
2014-05-28 17:56:18 +02:00
31e2d4e12a monitor diagnostics update
monitor diagnostics update
2014-05-28 17:52:37 +02:00
1a2b8e5475 Router spinlock wasn't used to protect routing. As a consequence router could have been closed in thread #1 while thread #2 was in a middle of execution of router code. Solved by holding router lock so that it covered whole routing operation. 2014-05-28 18:29:02 +03:00
e4545baf97 Node Replication Consistency
Node Replication Consistency
2014-05-28 17:27:09 +02:00
7108a25299 added routines
added routines
2014-05-28 15:56:10 +02:00
fe0fcd75e4 new monitor routines
new monitor routines
2014-05-28 15:44:51 +02:00
d0a30748ab Branch update
Branch update
2014-05-28 14:52:04 +02:00
ca4b53f1b8 Merge branch 'develop' into feature-MX-60 2014-05-28 14:48:27 +02:00
77b790efbf Replication lag support in server struct
Replication lag support in server struct and configuration
2014-05-28 14:47:35 +02:00
a73c9c8076 Completing fix to #438 2014-05-28 14:39:44 +03:00
89c51cff20 Completing fix to #438 2014-05-28 14:36:53 +03:00
a42e7b5702 Bug #438, http://bugs.skysql.com/show_bug.cgi?id=438 try to complete the fix. dcb->authlock was double-freed. 2014-05-28 14:06:06 +03:00
3514156f28 Merge branch 'develop' of github.com:skysql/MaxScale into develop 2014-05-28 11:20:45 +01:00
509379df70 Fix for NULL buffer past to gwbuf_length 2014-05-28 11:00:50 +01:00
798dd6a5a6 Added routines for interval and defaultId (MySQL)
Added routines for interval and defaultId (MySQL)
2014-05-28 11:51:58 +02:00
a1a3dcdfbb Merge branch 'develop' into feature-MX-60 2014-05-28 10:44:37 +02:00
f985e1cac5 server_id for MySQL replication set for each node
server_id for MySQL replication is now set for each node and
dprintServer* routines can print it as well
2014-05-28 10:43:01 +02:00
f80f8ce26d monitorID and monitor_interval
monitorID and monitor_interval
2014-05-28 10:06:49 +02:00
78a02f5297 Compile warning fixed in galera_mon.c
Compile warning fixed in galera_mon.c
2014-05-28 09:39:33 +02:00
a45e009dfe Merge branch 'feature-MAX-58' into develop
Merge branch 'feature-MAX-58' into develop
2014-05-28 09:31:29 +02:00
70115d35c9 Fix to bug #438 http://bugs.skysql.com/show_bug.cgi?id=438
Fixed some compiler warnings, added header includes, return values etc.
2014-05-27 17:07:41 +03:00
d12ed592a0 Removed a duplicate code added by merge
A code duplication occurred in a switch statement during the merge of the cenh branch
2014-05-27 09:44:17 +01:00
933025b017 Update
Update
2014-05-26 16:49:10 +02:00
a6d6938367 Merge branch 'feature-MAX-98' into develop 2014-05-26 14:17:30 +02:00
b54ca8e87f Default values for MONITOR_INTERVAL
Default values for MONITOR_INTERVAL
2014-05-26 14:16:56 +02:00
0e510cfa4a Default values for MONITOR_INTERVAL
Default values for MONITOR_INTERVAL
2014-05-26 14:15:51 +02:00
330c0f6bf7 MONITOR_INTERVAL default added
MONITOR_INTERVAL default added
2014-05-26 14:13:01 +02:00
b17744fd46 Monitor Version Update
Monitor Version Update
2014-05-26 14:07:04 +02:00
040e7158fc Merge branch 'feature-MAX-98' into develop 2014-05-26 14:05:47 +02:00
60e06080ff Monitor version update
Monitor version update
2014-05-26 14:05:29 +02:00
046e734d40 Merge branch 'feature-MAX-98' into develop 2014-05-26 13:58:18 +02:00
9b46bc063d Compile error
Compile error
2014-05-26 13:57:45 +02:00
375121aec7 Merge from feature-MAX-98
Merge from feature-MAX-98
2014-05-26 12:50:29 +02:00
c23773c977 Removed binlog path
Removed binlog path
2014-05-26 12:40:56 +02:00
952650ef18 Removed duplicated entry
Removed duplicated entry
2014-05-26 12:23:00 +02:00
378d00983d merge from branch 'cenh'
merge from branch ‘cenh’
2014-05-26 12:15:34 +02:00