e80d709ad8
Cleaning up code
2014-11-18 17:05:44 +02:00
a2f4b47e54
Fixed errors in filter harness file comparing.
2014-11-18 06:37:00 +02:00
80b83f0ac0
Merge branch 'develop' into firewall
...
Conflicts:
server/modules/filter/test/CMakeLists.txt
server/modules/filter/test/harness_common.c
2014-11-18 05:02:12 +02:00
7ef54219a6
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-17 23:28:25 +02:00
a30fc0c787
MAX-328, Add session identifier to trace log entries. Session id is given to session in session_alloc and stored to thread's local storage variable when thread picks a new event from epoll_wait.
2014-11-17 23:27:14 +02:00
d3df458b27
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
...
Conflicts:
server/modules/filter/test/harness_common.c
2014-11-17 20:20:33 +02:00
0b988e0f49
Added a dummy session and dcb to the filter harness.
...
Added tests for regexfilter.
2014-11-17 20:08:10 +02:00
2e7419e942
Fixed an infinite loop if network address reached '%' and fixed some null pointer references.
2014-11-17 19:35:05 +02:00
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
70eef7aaa8
Fix to bug #513 , http://bugs.skysql.com/show_bug.cgi?id=513
2014-11-17 15:33:13 +02:00
e8e1e63304
Merge branch 'firewall' of https://github.com/mariadb-corporation/MaxScale into firewall
...
Conflicts:
server/modules/filter/test/CMakeLists.txt
2014-11-17 15:16:12 +02:00
6bda88f252
Addition to fix to bug #597 , http://bugs.skysql.com/show_bug.cgi?id=597
2014-11-17 15:15:34 +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
67030d0019
Updated test harness.
2014-11-17 14:52:26 +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
0aac126162
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-17 12:51:41 +02:00
4708e97208
Added a 'testall-valgrind' target to CMake that runs the full test suite with Valgrind.
2014-11-17 12:47:24 +02:00
df9acee69a
Fix to bug# 616: Added checks that only one block buffer (the first one) is being moved at any one time.
2014-11-17 12:44:25 +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
e967aca2f0
Merge branch 'develop' of github.com:skysql/MaxScale into develop
2014-11-14 10:37:02 +00:00
4389cb06da
Add the CLI to the template configuration file
2014-11-14 10:36:32 +00: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
b37fb35669
Removed PID print to stderr
...
Removed PID print to stderr. it’s already included id message log
2014-11-14 10:03:11 +01:00
238c476d3a
getUsers try selecting a Master server
...
getUsers try selecting a Master server if available.
Next users reload will connect to master server
2014-11-13 17:41:50 +01:00
12b06a503e
Removed NULL pointer printing
...
Removed NULL pointer printing
2014-11-13 17:15:17 +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
fb9d792859
Fix to Coverity defect 76134
2014-11-13 09:02:56 +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