a5ece62327
Merge branch 'develop' into firewall
...
Conflicts:
server/modules/filter/test/harness.h
server/modules/filter/test/harness_common.c
2014-11-17 18:45:01 +02:00
e4bf42fcf4
Added a dummy session and dcb to the filter harness.
2014-11-17 18:42:20 +02:00
f233bfab66
Updated test harness and added preliminary firewall filter tests
2014-11-17 15:14:50 +02:00
1c4ffd2599
Fix to bug #597 , http://bugs.skysql.com/show_bug.cgi?id=597
...
Changed the order of include directives in query_classifier.cc
2014-11-17 14:55:13 +02:00
34b155b6fe
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-17 13:58:18 +02:00
c9b679359f
Made RWSplit to use slave selection criteria also during client session. Previously the criteria was use when slaves were selected for use of client session.
2014-11-17 13:40:18 +02:00
1399a33944
Merge branch 'develop' into firewall
2014-11-17 13:05:40 +02:00
a96f2fe57b
Fixed some typos and testing messages from CMake output.
2014-11-17 12:57:07 +02:00
4f136fa4d2
Fixed backend selection logic in get_dcb. If slave is not found write a warning to error log and fall through to master selection. If master has changed or previous master's state has changed, routing fails.
2014-11-15 23:57:09 +02:00
419fda5514
Fixed false positive debug assertion
2014-11-14 23:13:40 +02:00
e790437fc0
Fixed debug assert. If session is closed its router session pointer is nullified and it is not error.
2014-11-14 22:35:23 +02:00
18c12cfee6
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-14 20:48:50 +02:00
8c1e7172f3
Added debug logging for #615
2014-11-14 20:48:33 +02:00
a16d1d445e
Addition of flush log and flush logs command
2014-11-14 18:02:25 +00:00
e35ad0c5d3
Fix candidate for bug #615
...
Removed invalid debug assert
2014-11-14 17:50:07 +02:00
ca13e18f53
Added query operation type requirements on where clauses and fixed a bug with regex rules.
2014-11-14 16:28:20 +02:00
81009e7d19
Fix candidate to bug #615
...
Mark backend reference closed in handleError
2014-11-14 15:20:15 +02:00
89713f8bcb
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-14 13:08:48 +02:00
77aa9827fe
Fix candidate to bug #615 , http://bugs.skysql.com/show_bug.cgi?id=615
2014-11-14 13:06:35 +02:00
d090eee09b
Messages moved from stderr to MESSAGE log
...
Messages moved from stderr to MESSAGE log
2014-11-14 10:19:04 +01:00
949bbc99d9
Messages moved from stderr to MESSAGE log
...
Messages moved from stderr to MESSAGE log
2014-11-14 10:11:15 +01:00
9edee192a8
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-13 18:00:43 +02:00
175711a1bc
Fix to #601 , http://bugs.skysql.com/show_bug.cgi?id=601
...
if (func.auth ==)gw_change_user->gw_send_change_user_to_backend is called before backend has its scramble, auth packet is set to backend's delauqueue instead of writing it to backend. When backend_write_delayqueue is called COM_CHANGE_USER packets are rewritten with backend's current data.
2014-11-13 17:55:29 +02:00
171af0fc03
Merge branch 'develop' into firewall
2014-11-13 14:33:19 +02:00
fe20698fb0
Fixed a bug in httpd.c
2014-11-13 13:33:14 +02:00
afb8859b43
Merge branch 'develop' into firewall
2014-11-13 09:50:02 +02:00
59b587462a
Fix to Coverity defects 72714 75940 75941
2014-11-13 09:09:11 +02:00
aaa9bfd5c2
Fixes to Coverity defects 78241 78242 78243 78244 78245
2014-11-13 08:56:02 +02:00
fc5c3943e8
Fixes to Coverity defects:
...
72643
72645
72655
72656
72657
72658
72664
72698
72712
2014-11-12 19:02:37 +02:00
2b11b53144
Fixes to Coverity defects 72681, 72683, 72691.
2014-11-12 17:25:49 +02:00
e2930a4b9e
Fix for wrong default value
...
Fix for wrong default value
2014-11-12 15:15:39 +01:00
50a5a7892d
Repurposed old code and deleted obsolete code.
2014-11-11 14:27:23 +02:00
0ea4dd63a9
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-11 14:25:49 +02:00
128d5e3f48
Addition to previous fix
2014-11-11 14:25:34 +02:00
4a8f97d2e2
Merge branch 'develop' into firewall
2014-11-11 14:18:44 +02:00
98a362b430
Fix to Coverity error 72685
2014-11-11 14:10:15 +02:00
061fa62d29
Fixes to Coverity issues 77197 (mysql_common.c, dcb.c, mysql_client.c, skygw_debug.h), 72654 (poll.c), 72756 (mysql_backend.c), 72744 (mysql_backend.c), 77197 (mysql_common.c), 72746 (mysql_common.c), 72676 (mysql_common.c), 72705 (readwritesplit.c), 72697 (readwritesplit.c), 72652 (skygw_debug.h)
2014-11-11 14:10:06 +02:00
badc45f457
Coverity fix 72709
...
Coverity fix 72709
2014-11-11 10:56:56 +01:00
bc43ead78d
timeout options added to monitors
...
timeout options added to monitors
2014-11-11 08:46:56 +01:00
39b04682ea
COM_CHANGE_USER honours charset change
...
COM_CHANGE_USER honours charset change
2014-11-10 17:06:14 +01:00
49d28bc1f3
MySQL connect: charset flag is stored
...
MySQL connect: charset flag is stored and passed to backend
2014-11-10 16:09:55 +01:00
704c69eb40
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-10 17:06:01 +02:00
24c1106abf
Removed invalid assertion from readwritesplit.c
2014-11-10 17:05:40 +02:00
78ede89b3b
Addition of setNetworkTimeout in galera mon
...
Addition of setNetworkTimeout in galera mon
2014-11-10 15:31:36 +01:00
68df1b9c99
Addition of timeout for connect,read,write
...
Addition of timeout for connect,read,write in mysql_mon.c
2014-11-10 15:13:26 +01:00
9a5168c3e8
Put errors ganerating code behind FAKE_CODE macro, which is not defined by default in any build.
2014-11-10 15:22:08 +02:00
7f7cb0a982
Switched from CPU time to real time in connection test.
2014-11-10 14:30:56 +02:00
a3675e9098
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-10 14:18:43 +02:00
62270412cf
readwritesplit.c: prevent switching the master during session. Added logging to cases where master has changed.
...
Moved DCB's member errhandle_called behing DEBUG flags to Release build. It shows if handleError is called for a DCB and makes it possible to avoid redundant calls.
2014-11-10 14:15:32 +02:00
3b07449daa
Fix to bug #614 , http://bugs.skysql.com/show_bug.cgi?id=614
...
Added protected state check to mysql_client.c, fixed locking in session.c
2014-11-10 14:07:51 +02:00
