8fed527ac9
Merge branch 'release-1.0GA' into blr
2014-12-08 09:21:38 +00:00
ce056dccd8
Update modue status of all GA modules
2014-12-08 09:19:35 +00:00
e76215bf07
Added detection of COM_INIT_DB
2014-12-08 11:15:10 +02:00
4c1ed65617
Added dbshard template to MaxScale_template.cnf
...
Added NULL-check to createInstance to avoid NULL-pointer reference if user/pwd is missing from config.
Removed unnecessary code, added error messages, fixed intendation.
2014-12-07 23:34:47 +02:00
0348df5147
Fixed databases being queried without a username or password and ignored the default databases when checking for shards.
2014-12-07 13:16:53 +02:00
15a96f037d
Merge remote-tracking branch 'origin/MAX-324' into MAX-324
...
Conflicts:
server/modules/routing/dbshard/dbshard.c
2014-12-07 06:11:24 +02:00
68fc849c6e
query_classifier.cc:cleaned up some intendentions and brackets.
...
dbshard.h:removed unnecessary code
dbshard.c:removed unnecessary code, cleaned up a bit and made some required changes
readwritesplit.c:removed two unnecessary variable assignments.
2014-12-07 00:34:23 +02:00
a580799eb2
Added messages about missing usernames and passwords for servers.
2014-12-07 00:07:58 +02:00
94b6fc8ff1
Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
2014-12-06 12:48:37 +02:00
06578c95a5
Updates to dbshard router:
...
Added a parsing function to query classifier that returns an array of database names the query uses.
Added a check if the query targets a sharded database. If so, a hint is added that routes the query to the named server.
2014-12-06 11:30:07 +02:00
cce35d9035
Add event name in show service
2014-12-05 13:49:41 +00:00
a0cebae0ec
Make building the binlog router conditional
2014-12-05 11:43:06 +00:00
e102d56e69
Merge branch 'blr' into release-1.0GA
...
Conflicts:
server/modules/protocol/mysql_backend.c
server/modules/routing/binlog/blr_master.c
2014-12-05 11:42:02 +00:00
2b998eb17f
Merging binlog router into beta refresh
2014-12-05 11:30:03 +00:00
4db86a5520
Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA
2014-12-04 16:57:57 +00:00
36aea7454f
Updates for new logging definitions
2014-12-04 16:56:33 +00:00
e4c379bbdc
Fix to bug 583 http://bugs.mariadb.com/show_bug.cgi?id=583
...
Changed rwsplit.sh to explicitly use /bin/bash
2014-12-03 19:41:06 +02:00
b106560317
Fix to bug # 634, http://bugs.skysql.com/show_bug.cgi?id=634
...
COM_SHOW_SLAVE_STAT wasn't classified but it was treated as 'unknown' and thus routed to master.
2014-12-03 13:27:31 +02:00
7079cb4749
Cleaned a bit
2014-12-03 10:35:34 +02:00
ed8404d9c7
Fixed some of compiler errors
2014-12-02 11:05:14 +02:00
83477042a1
Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
2014-12-02 10:37:53 +02:00
ef4f9aac4f
Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
...
Conflicts:
server/modules/include/dbshard.h
server/modules/routing/dbshard/dbshard.c
2014-12-01 19:34:20 +02:00
a78ac19a87
Added createInstance and newSession, cleaned up things related to other routers.
2014-12-01 15:52:00 +02:00
1135b2c23f
Removed 'information_schema' from the sharding checks and set the default weights of the backend to 1.
2014-12-01 15:02:44 +02:00
66164aa664
Added functions that query backend servers for database names
2014-12-01 14:27:33 +02:00
43d348e3ac
Place holders for dbshard.c
2014-12-01 09:58:46 +02:00
1bfedbee1d
Fix to bug #629 , http://bugs.skysql.com/show_bug.cgi?id=629
...
Master was selected for routing target even there was a slave available.
2014-11-28 14:17:35 +02:00
9aa828cd9b
Added debug assertions to catch wrong DCB usage
2014-11-27 22:04:34 +02:00
3941f5c31d
Added debug trace
2014-11-27 19:48:27 +02:00
3e18e091c1
Fixed unreported bug in log_manager where a terminating character was added in the middle of log message.
2014-11-27 16:53:50 +02:00
863a30c969
Merge branch 'blr' of https://github.com/mariadb-corporation/MaxScale into blr
...
Conflicts:
server/core/gateway.c
2014-11-26 08:47:50 +00:00
268f2950b7
Missed lgging externs
2014-11-21 15:07:41 +00:00
0dc5dca858
Added externs for Vilho's logging changes
2014-11-21 15:07:10 +00:00
ba44605cb0
Changes for FDE events
2014-11-21 15:01:38 +00:00
2e3fb9cbd3
Changed the 'seslog' command to 'sessionlog' in the telnet client.
2014-11-19 16:55:18 +02:00
2e456c7348
Changed the order of help messages about seslog command
2014-11-19 15:22:12 +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
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
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
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
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
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
