dee20fe077
Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
...
# Conflicts:
# server/core/CMakeLists.txt
# server/core/buffer.c
# server/core/service.c
# server/modules/filter/tee.c
# server/modules/monitor/mysql_mon.c
# server/modules/routing/binlog/blr.c
# server/modules/routing/binlog/blr_slave.c
# server/modules/routing/debugcmd.c
# server/modules/routing/readwritesplit/readwritesplit.c
# utils/skygw_utils.cc
- resolved.
2015-11-11 11:08:02 +00:00
834a88aeda
Log variables moved to log_manager.h
...
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
99ac4876f4
Fixed wrong variables being passed.
2015-11-03 12:16:22 +02:00
a969de7d50
Changed unnecessary strncpy to strcpy.
2015-11-03 12:16:22 +02:00
3903c4a35d
Renamed and moved variables around
...
Renamed variables to make more sense and reordered them to be more in line with
the function's purpose.
2015-11-03 12:16:22 +02:00
50b0a9b71b
Code changes based on review of 1e8afe5063134b7c56492b3777ae1248b1587ba4
2015-11-03 12:16:22 +02:00
d5c38b93f6
Fix to MXS-431: https://mariadb.atlassian.net/browse/MXS-431
...
Replaced the use of the shared MySQLSession structure with an internal variable
that tracks the currently active database.
2015-11-03 12:16:22 +02:00
18c53bebf1
Fix to MXS-430: https://mariadb.atlassian.net/browse/MXS-430
...
Added caching of the hashtables used to map databases to servers.
2015-11-03 12:16:22 +02:00
c37e18e3d2
Moved included headers back to .c file
2015-10-28 15:07:50 +02:00
8d84deecc5
Updated schemarouter to use PCRE2 and moved includes to the header file.
2015-10-28 15:07:50 +02:00
7e1034a740
All conflicts are printed when processing databases.
2015-10-05 10:20:58 +03:00
6227d9f834
Cleaned up schemarouter code.
2015-10-05 10:20:58 +03:00
a576606f2b
Updated schemarouter duplicate DB code based on code review.
2015-10-05 10:20:58 +03:00
af2bc91383
Cleaned up the clientReply function of the schemarouter.
2015-10-05 10:20:58 +03:00
bff6db96a1
Same database on more than one server now cause the schemarouter session to be closed.
2015-10-05 10:20:58 +03:00
e38ea9d07d
Correct missing return value.
2015-10-02 16:19:59 +01:00
2231d0870c
Place checks in callback routines because DCB will not always contain a reference to a router session, and the associated data will be invalid in this case.
2015-09-25 12:17:18 +01:00
cfeaf7d6e9
Merge remote-tracking branch 'origin/develop' into MXS-329
...
Conflicts:
server/core/session.c
2015-09-10 13:07:27 +01:00
f6916a23bd
Move responsibility for closing DCB on error to router error handling. Check that routers remove or disable links to closed DCB.
2015-09-09 09:33:00 +01:00
986c918d52
Remove ERRACT_RESET action from router error handler; remove sole call from mysql_client. Correct comments on parameters for router error handlers.
2015-09-09 08:31:59 +01:00
160bbb70ee
MXS-251: strerror
...
Replaces all calls to strerror with calls to strerror_r. The former
is non-thread safe while the latter is.
2015-09-05 15:52:13 +03:00
9a6e3a9a86
Fix to Coverity defect.
2015-08-20 09:34:52 +03:00
185ff4343c
Added a missing NULL check.
2015-08-14 09:54:51 +03:00
deee4479a3
Merge branch 'develop' into schemarouter_refresh
2015-08-10 12:35:22 +03:00
a74ed87d07
Removed redundant linking of the utils library.
2015-08-10 10:40:00 +03:00
c3e1e2b345
Merge branch 'develop' into schemarouter_refresh
...
Conflicts:
Documentation/Tutorials/Replication-Proxy-Binlog-Router-Tutorial.md
2015-08-08 11:25:54 +03:00
78eab19c62
Fixed compiler warnings.
2015-07-14 17:13:09 +03:00
e146b2d632
Merge branch 'release-1.2' into schemarouter_refresh
2015-07-13 19:10:05 +03:00
6497350ab7
Merge branch 'release-1.2' into develop
...
Conflicts:
server/core/adminusers.c
server/modules/protocol/mysql_client.c
2015-07-11 17:12:48 +03:00
ba417ef633
Merge remote-tracking branch 'origin/develop' into MXS-122
...
Conflicts:
server/core/dcb.c
2015-07-08 14:54:22 +01:00
10d690273d
Resolve compiler warnings
2015-07-08 11:35:41 +01:00
af2ce0f4f1
Fix to MXS-252: https://mariadb.atlassian.net/browse/MXS-252
...
Added missing buffer length parameter.
2015-07-08 12:45:48 +03:00
1af73b7061
Fixed common sharding functions referring to schemarouter.
2015-07-06 18:12:08 +03:00
1eb907ad38
Fixed common sharding functions referring to schemarouter.
2015-07-03 17:08:32 +03:00
a9e0a52b9e
Fixed false positives in SHOW SHARDS detection.
2015-07-03 13:59:25 +03:00
5964a68143
Added SHOW SHARDS functionality into schemarouter.
2015-07-03 13:44:22 +03:00
993ec723b9
Added verbose client errors to schemarouter.
2015-07-02 13:28:23 +03:00
4c38e2224b
Merge remote-tracking branch 'origin/develop' into MXS-122
...
Conflicts:
server/core/CMakeLists.txt
server/core/dcb.c
server/include/dcb.h
server/include/server.h
server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
b1c383b19e
Added database list refreshing to schemarouter.
2015-06-09 16:13:06 +03:00
d0e92a15f8
Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded.
2015-06-09 11:41:43 +01:00
5f076b81d4
Merge branch 'install_dir_change' into develop
...
Conflicts:
CMakeLists.txt
Documentation/Tutorials/Administration-Tutorial.md
log_manager/CMakeLists.txt
server/core/CMakeLists.txt
server/core/gateway.c
server/core/maxkeys.c
server/core/maxpasswd.c
server/modules/filter/test/CMakeLists.txt
server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
8301410c79
Fixed possible memory leaks in schemarouter.
2015-05-11 22:02:35 +03:00
8647b30184
Merge remote-tracking branch 'origin/develop' into MXS-105
...
Conflicts (resolved):
server/modules/routing/schemarouter/schemarouter.c
2015-05-05 10:54:09 +01:00
463cd4a97e
Moved common sharding functions to a separate file.
2015-05-04 07:06:24 +03:00
550b130d91
Schemarouter shortest session statistic now only updates session with a length of more than zero seconds.
2015-05-01 11:13:43 +03:00
2498278582
Fixed queued queries not being freed if session was closed before they could be routed.
2015-04-30 22:22:26 +03:00
8b7158afda
Merge remote-tracking branch 'origin/develop' into MXS-105
2015-04-24 15:40:07 +01:00
03badb9b7b
Modifications to galera monitor to control whether selection of master is wanted.
2015-04-24 15:35:10 +01:00
fbfbc9fda7
Added more statistics to schemarouter diagnostics.
2015-04-23 21:00:52 +03:00
d1551be54f
Added support for disabling the saving of the session command history for the schemarouter.
2015-04-23 19:35:41 +03:00
