Commit Graph

78 Commits

Author SHA1 Message Date
c2c27d7cca Merge from develop
Merge from develop
2015-09-14 09:49:33 +02:00
955974d06b Removed unused XID var
Removed unused XID var
2015-09-14 09:43:13 +02:00
bb72b0c892 Fixed compiler warnings. 2015-09-12 04:46:47 +03:00
520198b870 Removed previous conflict line
Removed previous conflict line
2015-09-10 15:06:46 +02:00
c9fd82839b Merge from develop
Merge from develop
2015-09-10 14:53:50 +02:00
7d00a3670d Addition of maxbinlogcheck, a new utility in bin
Addition of maxbinlogcheck, a new utility in bin
2015-09-10 14:37:49 +02:00
9815fef590 Moved some routines at the end of the file
Moved some routines at the end of the file
2015-09-10 12:03:49 +02:00
0ddabccd2f Documentation update
Documentation update
2015-09-09 15:35:24 +02:00
9bfefa95ae maxbinlogcheck update
maxbinlogcheck update
2015-09-08 17:27:28 +02:00
d6be8361fa Added Transaction Summary with events and bytes
Added Transaction Summary with events and bytes
2015-09-07 18:17:03 +02:00
f60254f626 Added MariaDB 10 transaction detection
Added MariaDB 10 transaction detection
2015-08-26 17:32:45 +02:00
ca305748b8 Typo fixed
Typo fixed
2015-08-26 11:56:40 +02:00
262b64eb39 Log messages updated
Log messages updated
2015-08-26 11:42:24 +02:00
3fe0c074c5 Added strerror_r and new constants
Added strerror_r and new constants
2015-08-24 15:02:22 +02:00
599e2fdc6c Small improvements for string buffers
Small improvements an constants added in string buffers
2015-08-24 11:38:24 +02:00
311b8414d3 Fixed message log parameter
Fixed message log parameter
2015-08-12 15:30:24 +02:00
1f1671a0e2 Version upate
Version upate
2015-08-12 11:18:04 +02:00
6a02608382 Removed useless vars and code cleanup
Removed useless vars and code cleanup
2015-08-11 18:09:49 +02:00
310bf4be54 Removed unused var
Removed unused var
2015-08-11 09:40:21 +02:00
81e4051f9e Mariadb 10 event check in blr_read_events_all_events
Mariadb 10 event check in blr_read_events_all_events
2015-08-10 15:58:34 +02:00
9bada09d2d Update messages on errors
Update messages on errors
2015-08-09 23:14:55 +02:00
12ddd8e830 Added mariadb10 cache data
Added mariadb10 cache data
2015-08-09 20:34:45 +02:00
479e4e3203 Added blr_check_binlog at router startup if trx_safe is set
Added blr_check_binlog at router startup if trx_safe is set
2015-08-07 11:59:15 +02:00
e5a2e5cd1f Improvements added in stop/start slave and change master
Improvements added in stop/start slave and change master
2015-08-06 17:47:37 +02:00
f91a339674 Initial implementation of transaction safety
Initial implementation of transaction safety
2015-08-05 14:29:17 +02:00
61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c
2015-08-04 07:59:44 -04:00
aa6294f1f2 Fixed binlogrouter not working with C99 flags. 2015-07-20 08:59:35 +03:00
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
37fd2b6e87 Added chmod 600 for master.ini
Added chmod 600 for master.ini
2015-07-13 19:00:22 +02:00
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
5165c6b981 master.ini contains now master configuration
master.ini contains now master configuration
It can be created or modified by CHANGE MASTER TO
Added new BLRM_UNCONFIGURED state
2015-06-30 16:10:02 +02:00
7a0a010a86 CHANGE MASTER error messages improvement
CHANGE MASTER error messages improvement
New Start Slave implementation
Error Handling when master_state is BLRM_BINLOGDUMP: in case of error
master replication stops and new state is BLRM_SLAVE_STOPPED
2015-06-23 15:34:56 +02:00
022179ca12 start slave may create a new binlog file
start slave may create a new binlog file
2015-06-23 10:05: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
5bc07c5100 Added error handling in BINLOG_DUMP phase
Added error handling in BINLOG_DUMP phase: router goes into
BLRM_SLAVE_STOPPED state

Removed blr_file_add_magic called twice
2015-06-22 10:35:02 +02:00
4952dc48bb Added constraints to CHANGE MASTER TO options
Added constraints to CHANGE MASTER TO options  MASTER_LOG_FILE and
MASTER_LOG_POS
2015-06-15 15:03:27 +02:00
809cdb5b1e Added blr_cache_read_master_data and dcb checks
Added blr_cache_read_master_data()
Added dcb checks before calling db_close
Forced initialisation values of some parameters
2015-06-08 16:56:52 +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
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
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
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
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
b6cc739044 Fix to blr_file. 2015-03-12 18:37:07 +02:00