Commit Graph

332 Commits

Author SHA1 Message Date
343cb49f8c fprintf removed
fprintf removed
2015-08-07 17:19:49 +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
619261cd21 Small improvements
Small improvements
2015-08-04 16:39:03 +02:00
1fc335e5f7 Fixed compile warnings
Fixed compile warnings
2015-08-04 15:55:34 +02:00
02496d7410 Fixed error message in createInstance
Fixed error message in createInstance
2015-08-04 15:47:41 +02:00
28da5f2470 Fixed compile errors
Fixed compile errors
2015-08-04 14:19:53 +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
a28936c5bf Update with various small fixes
Update with various small fixes
2015-07-29 14:33:52 +02:00
2d6780288a Fix spelling errors. 2015-07-29 12:11:09 +01:00
bf4630bb2c Removed extra statements
Removed extra statements
2015-07-28 13:27:36 +02:00
9ef43c9d9e Logged statement is truncated if contains 'password'
Logged statement is truncated if contains 'password'
2015-07-28 13:25:14 +02:00
8d7def654a Merge part of MXS-289 bug
Merge part of MXS-289 bug
2015-07-28 12:47:21 +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
f22e2ec87b Added Connecting state in Slave_IO_Running
Added ‘Connecting’ state in Slave_IO_Running field of SHOW SLAVE STATUS
2015-07-15 09:18:55 +02:00
7b9d54d1d4 Removed MASTER_PASSWORD from logs
Removed MASTER_PASSWORD from logs
2015-07-14 17:32:42 +02: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
df17527527 Fixed wrong message parameter
Fixed wrong message parameter
2015-07-13 19:28:32 +02:00
37fd2b6e87 Added chmod 600 for master.ini
Added chmod 600 for master.ini
2015-07-13 19:00:22 +02:00
9480c01b96 New log messages for dbusers loading failure
New log messages for dbusers loading failure
2015-07-13 18:12:34 +02:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
a16d4c46d6 Changed default master port to 3306
Changed default master port to 3306
2015-07-13 12:44:03 +02: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
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
b526da1fd4 Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
2015-06-26 09:52:57 +02:00
cd7f7aba57 CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
2015-06-23 17:42:42 +02:00
543873a44f Add default for missing MASTER_LOG_POS
Add default for missing MASTER_LOG_POS

4 if binlog is a new one
current pos if binlog = current one
2015-06-23 17:19:54 +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
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
2816d87013 fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()

fix for missing @@version_comment in order to allow mysql client get in
2015-06-22 18:21:43 +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
64bb68c12c inst->master_chksum = true; is put back
inst->master_chksum = true; is put back
2015-06-17 12:23:31 +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
d94ac9c637 Added new general error message
Added new general error message
Added
Slave_IO_Running: No
Slave_SQL_Running: No

when slave is stopped
2015-06-09 16:46:41 +02:00
1cbc7d6e7f Added error string to router->m_errmsg
Added error string to router->m_errmsg
2015-06-09 12:39:50 +02:00
f46c47651a Compile error, missing ';'
Compile error, missing ';'
2015-06-09 10:33:23 +02:00
2db4f4d771 Added error_msg to blr_slave_send_slave_status()
Added error_msg to blr_slave_send_slave_status()
2015-06-08 19:16:50 +02:00
d9234bec5f Updated logging messages
Updated logging messages
2015-06-08 17:30:26 +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
945e2f8132 added checks in blr_stop_slave()
errorReply sets mysql_errno into router struct
blr_slave_send_slave_status displays mysql errno
added checks in blr_stop_slave()
2015-06-05 17:37:05 +02:00
2a15e6e774 server_update_port/address are used
server_update_port and server_update_address now used by
blr_handle_change_master
2015-06-03 10:30:03 +02:00