a91fe90915
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 15:19:09 +02:00
990de59241
Added find_package modules for MySQLClient and RabbitMQ and fixed an error in consumer.c
2014-11-19 15:16:10 +02:00
e67ded72a0
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 12:07:13 +00:00
d3c8770852
Merge branch 'blr' into develop
...
Conflicts:
client/maxadmin.c
server/core/CMakeLists.txt
server/core/dcb.c
server/core/gateway.c
server/core/poll.c
server/core/test/CMakeLists.txt
server/core/test/makefile
server/include/poll.h
server/modules/routing/debugcmd.c
2014-11-19 12:00:55 +00:00
2c87edfe27
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 13:28:40 +02:00
9cc0e1316c
Fix to #594 , http://bugs.skysql.com/show_bug.cgi?id=594
...
Changes to readwritesplit.c:get_dcb caused regression
2014-11-19 13:27:43 +02:00
c3439027d4
Fixed a missing session list iteration from debugcmd.c
2014-11-19 13:07:37 +02:00
6cbbf7260f
Improved logging and diagnostics
2014-11-19 10:49:40 +00:00
ed461d58e2
Moved messages to message log
...
Moved messages to message log and others printed only with DEBUG mode
compile setting
2014-11-19 11:36:44 +01:00
d4894b3c1d
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 12:26:49 +02:00
2556097a98
Added commands to debugcmd.c that enable and disable logs for a single session.
...
Added the session id to dprintAllSessions and dprintSession output.
2014-11-19 12:25:33 +02:00
580f9730f6
Fix to #621 , http://bugs.skysql.com/show_bug.cgi?id=621
2014-11-19 12:14:24 +02:00
a65d8cd525
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 09:38:22 +02:00
98390e89cc
Added dummy cli commands that would enable and disable session logs.
2014-11-19 09:37:24 +02:00
bb39267126
Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop
2014-11-19 00:15:21 +02:00
fd11e6a7f5
Session-specific logging. Added functions
...
void session_enable_log(SESSION* ses, logfile_id_t id)
and
void session_disable_log(SESSION* ses, logfile_id_t id)
Which switch specific log type on/off if the log type in question is not generally enabled.
Each thread carries a thread-specific struct log_info_t which includes members for current session id and bitfield for enabled log types for the current session. That information is checked before actual log write functions are called.
Each file where session-specific logging is used, must include the following exports:
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
2014-11-19 00:08:59 +02:00
e80d709ad8
Cleaning up code
2014-11-18 17:05:44 +02:00
fc04087ab4
Valgrind tests completed
...
Valgrind tests completed, message removed
2014-11-18 13:19:38 +01:00
91f65072a2
Slave status removed of 1 server only
...
Slave status removed of 1 server only
2014-11-18 13:07:49 +01:00
e2fd2c422e
One server only in MySQL monitor config
...
One server only in MySQL monitor: it’s the Master.
Only one server in mysql monitor and in router sections
2014-11-18 11:25:21 +01: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
67a0f65b74
Fixed issue with not releasing the spinlock in show tasks
2014-11-17 11:56:41 +00: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
