Commit Graph

145 Commits

Author SHA1 Message Date
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
1731a90fad Fix for lastEventTimestamp localtime
Fix for lastEventTimestamp localtime computation
2015-08-25 11:37:17 +02:00
799844e243 Fixed MXS-111 https://mariadb.atlassian.net/browse/MXS-111
Fixed MXS-111 https://mariadb.atlassian.net/browse/MXS-111
2015-08-24 10:52:26 +02:00
895989446d MXS-224: Added SQL commands to the log message at slave disconnect time
MXS-224: Added SQL commands to the log message at slave disconnect time
2015-08-19 12:04:15 +02:00
556e99b2a9 Fix for bug MXS-289
Added fix for bug MXS-289
2015-07-27 18:44:05 +02:00
3628b6db60 Moved some of the binlogrouter sanity checks to be done before any memory allocation takes place. 2015-07-23 11:12:26 +03:00
aa6294f1f2 Fixed binlogrouter not working with C99 flags. 2015-07-20 08:59:35 +03:00
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
9728ec6169 Addition of new mariadb10 events to diagnostics()
Addition of new mariadb10 events to diagnostics()
2015-07-13 12:54:04 +03:00
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
71664f162b Merge branch 'develop' into dev-mdb10 2015-06-22 19:27:34 +03:00
15e6d6f9fc fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()
2015-06-22 18:24:39 +02:00
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
8c900e73de removed extra blr_file_add_magic
removed extra blr_file_add_magic
2015-06-22 10:46:00 +02:00
2f2c9c8cbc Fix for MariaDB10 state machine
Fix for MariaDB10 state machine
2015-06-02 09:45:26 +02: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
0d85ae6603 Changed data directory to /var/lib/maxscale. 2015-05-22 11:31:22 +03:00
a48e694dba Fix for log messages
Fix for log messages about MariaDB 10 registration and unexpected query
2015-05-11 12:42:14 +02:00
f991e58b57 MariaDB 10 master requires MariaDB 10 slaves
Only MariaDB 10 slaves can register to binblog server with a MariaDB 10
Master
2015-05-11 11:43:21 +02:00
230f88737c Added reading saved mariadb10 data
Added reading saved mariadb10 data
2015-05-07 18:05:04 +02:00
5d1e09ca4f Added MariaDB 10 Compatibility without GTID
Added MariaDB 10 Compatibility without GTID
2015-05-07 17:14:39 +02:00
7d48779913 Added MAX_EVENT_TYPE_MARIADB10 check
Added MAX_EVENT_TYPE_MARIADB10 check  for router->mariadb10_compat
2015-05-07 17:02:33 +02:00
2c2a03a6f6 Always reply to SET @mariadb_slave_capability
Always reply to SET @mariadb_slave_capability, with saved master reply
for mariadb10 master or with OK otherwise
2015-05-07 16:10:35 +02:00
3f2876bde3 Fixed buffer free
Fixed buffer free
2015-05-07 15:32:12 +02:00
e9391ef486 MariaDB 10 optional compatibility
MariaDB 10 optional compatibility with mariadb10-compatibility=1
2015-05-07 15:16:37 +02:00
bc7cc2a466 Added variables for MariaDB 10 compatibility. 2015-05-07 12:56:58 +03:00
5c7b2a68e5 mariadb10 compatibility test without GTID
First implementation of mariadb10 compatibility test without GTID

State machine to be modified for mysql5.6/mariadb10 compatibility
router options for mariadb10 slave registration still missing
2015-05-06 12:19:18 +02:00
3874400abf Fixed resource leak in blr_file. 2015-04-28 11:45:53 +03:00
55249193a9 Updated post-install scripts and binlogrouter
Binlogrouter: Switched hard-coded maximum path values to PATH_MAX and used cache directory instead of MAXSCALE_HOME
Scripts: Updated with new executable file paths
2015-04-27 14:47:26 +03:00
1f21540f8c Make MaxScale handle zero-length files to aid bootstrapping.
When bootstrapping a binlog router to start it needs to know the first
file to use. You can provide this information in the config file but
that will never be up to date, or you can copy a file to the binlog
server and start maxscale. It will then carry on from the last file’s
current position.

The binlog files have a 4-byte magic prefix so to start from the beginning
(position 4) you need to add these to an empty file if you do this by
hand. If you don’t then maxscale will attempt to download from the
master at position 0 and the master will not accept this value. (This is
not apparent with a mysql client as change master to … master_log_pos
= 0 triggers a write of the 4 magic bytes and then asks the master for
information from position 4 [not 0]).

This patch makes MaxScale behave similarly and allows you to only
need to touch the first binlog file to be downloaded for it to do the
right thing.
2015-04-27 13:46:06 +03:00
17a7b2addb Updated more variables. 2015-04-26 20:08:27 +03:00
df9bc65430 Added variables that are used when installing instead of relative paths. 2015-04-25 18:35:47 +03:00
bbdfc3a5a7 Revert "Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop"
This reverts commit 58e85098f931f6337841b25126fad23b579a9b49, reversing
changes made to c89c7047053f0d6f89069d1b6da2f9caa856066b.
2015-04-24 17:57:29 +03:00
087e2df5a4 Make MaxScale handle zero-length files to aid bootstrapping.
When bootstrapping a binlog router to start it needs to know the first
file to use. You can provide this information in the config file but
that will never be up to date, or you can copy a file to the binlog
server and start maxscale. It will then carry on from the last file’s
current position.

The binlog files have a 4-byte magic prefix so to start from the beginning
(position 4) you need to add these to an empty file if you do this by
hand. If you don’t then maxscale will attempt to download from the
master at position 0 and the master will not accept this value. (This is
not apparent with a mysql client as change master to … master_log_pos
= 0 triggers a write of the 4 magic bytes and then asks the master for
information from position 4 [not 0]).

This patch makes MaxScale behave similarly and allows you to only
need to touch the first binlog file to be downloaded for it to do the
right thing.
2015-04-23 20:26:56 +02:00
d490c2c509 Added casts to unsigned long to some log messages. 2015-04-08 10:54:42 +03:00
5ce1b742e9 Binlog Router, slave binlog_pos is now uint32
Binlog Router, slave binlog_pos is now uint32
2015-04-02 16:52:48 +02:00
3b6d71086e DISCONNECT logs now to message file
DISCONNECT logs now to message file
2015-04-02 10:21:43 +02:00
bb65222e89 Fixed wrong var name
Fixed wrong var name detection
2015-04-01 16:56:29 +02:00
5fb7195091 Fixed extra ' in crc32 value check. 2015-04-01 10:22:24 +03:00
4c418a128d Combined some conditionals in blr_slave. 2015-04-01 10:10:37 +03:00
04229423fc Fix checksum for NONE
Fix checksum for NONE as mysqlbinlog sends SET
@master_binlog_checksum='NONE'
2015-04-01 08:30:34 +02:00
da406db292 Changed install path to /usr/local/mariadb-maxscale 2015-03-23 20:12:56 +02:00
7cfc1d3cc9 Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'. 2015-03-23 14:53:31 +02:00
29dcd93979 MariaDB 10 support and checksum fix
MariaDB 10 support and checksum fix
2015-03-19 09:56:00 +01:00
646952290e Fix added for binlog_checksum=NONE
Fix added for binlog_checksum=NONE
2015-03-18 17:43:48 +01:00