mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
ffc0d185da
This allows one to setup a master <-> master replication with non conflicting auto-increment series. Cleaned up binary log code to make it easyer to add new state variables. Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave). Simplified binary log handling. Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly) mysql-test/r/mix_innodb_myisam_binlog.result: Disable End_log_pos column from 'show binlog events' as this is now different from before mysql-test/t/mix_innodb_myisam_binlog.test: Disable End_log_pos column from 'show binlog events' as this is now different from before sql/ha_berkeley.cc: Changed prototype for get_auto_increment() sql/ha_berkeley.h: Changed prototype for get_auto_increment() sql/ha_heap.cc: Changed prototype for get_auto_increment() sql/ha_heap.h: Changed prototype for get_auto_increment() sql/ha_innodb.cc: Change how auto-increment is calculated. Now the auto-increment logic is done in 'update_auto_increment()' to ensure that all handlers has the same auto-increment usage sql/ha_innodb.h: Changed prototype for get_auto_increment() sql/ha_myisam.cc: Changed prototype for get_auto_increment() sql/ha_myisam.h: Changed prototype for get_auto_increment() sql/ha_ndbcluster.cc: Changed prototype for get_auto_increment() sql/ha_ndbcluster.h: Changed prototype for get_auto_increment() sql/handler.cc: Remove some usage of current_thd Changed how auto_increment works with SET INSERT_ID to make it more predictable (Now we should generate same auto-increment serie on a slave, even if the table has rows that was not on the master. Use auto_increment_increment and auto_increment_offset sql/handler.h: Changed prototype for get_auto_increment() sql/log.cc: Remove usage of 'set_log_pos()' to make code simpler. (Now log_pos is set in write_header()) Use 'data_written' instead of 'get_event_len()' to calculate how much data was written in the log sql/log_event.cc: Simple optimizations. Remove cached_event_len (not used variable) Made comments fit into 79 chars Removed Log_event::set_log_pos(). Now we calculate log_pos in write_header(). Renamed write_data() to write() as the original write() function was not needed anymore. Call writing of event header from event::write() functions. This made it easier to calculate the length of an event. Simplified 'write_header' and remove 'switches' from it. Changed all write() functions to return 'bool'. (The previous return values where not consistent) Store auto_increment_increment and auto_increment_offset in binary log Simplified how Query_log_event's where written and read. Now it's much easier to add now status variables for a query event to the binary log. Removed some old MySQL 4.x code to make it easier to grep for functions used in 5.0 sql/log_event.h: Changed return type of write() functions to bool. (Before we returned -1 or 1 for errors) write_data() -> write() Added 'data_written' member to make it easier to get length of written event. Removed 'cached_event_len' and 'get_event_len()' Added usage of auto_increment_increment and auto_increment_offset Added 'artifical_event' to Start_log_event_v3, to hide logic that we in the binary log use log_pos=0 as a flag for an artifical event. sql/mysqld.cc: Added options --auto-increment-increment and --auto-increment-offset sql/set_var.cc: Added variables auto_increment_increment and auto_increment_offset sql/slave.cc: Changed errors -> warnings & information (in error log) sql/sql_class.cc: Added THD::cleanup_after_query(). This makes some code simpler and allows us to clean up 'next_insert_id' after query sql/sql_class.h: Added new auto_increment_xxx variables Moved some functions/variables in THD class sql/sql_help.cc: Removed compiler warning sql/sql_insert.cc: Call 'restore_auto_increment()' if row was not inserted. This makes it easier for handler to reuse the last generated auto-incrment value that was not used (for example in case of duplicate key) sql/sql_parse.cc: Use cleanup_after_query() sql/sql_prepare.cc: Use cleanup_after_query() sql/sql_table.cc: R
187 lines
3.8 KiB
Text
187 lines
3.8 KiB
Text
# Check that binlog is ok when a transaction mixes updates to InnoDB and
|
|
# MyISAM.
|
|
# It would be nice to make this a replication test, but in 4.0 the
|
|
# slave is always with --skip-innodb in the testsuite. I (Guilhem) however
|
|
# did some tests manually on a slave; tables are replicated fine and
|
|
# Exec_Master_Log_Pos advances as expected.
|
|
|
|
-- source include/have_innodb.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
connection con1;
|
|
create table t1 (a int) engine=innodb;
|
|
create table t2 (a int) engine=myisam;
|
|
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(1);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(2);
|
|
insert into t2 select * from t1;
|
|
# should say some changes to non-transact1onal tables couldn't be rolled back
|
|
rollback;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(3);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(4);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(5);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(6);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(7);
|
|
commit;
|
|
select a from t1 order by a; # check that savepoints work :)
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
# and when ROLLBACK is not explicit?
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
select get_lock("a",10);
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
disconnect con1;
|
|
|
|
connection con2;
|
|
# We want to SHOW BINLOG EVENTS, to know what was logged. But there is no
|
|
# guarantee that logging of the terminated con1 has been done yet (it may not
|
|
# even be started, so con1 may have not even attempted to lock the binlog yet;
|
|
# so SHOW BINLOG EVENTS may come before con1 does the loggin. To be sure that
|
|
# logging has been done, we use a user lock.
|
|
select get_lock("a",10);
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
# and when not in a transact1on?
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
insert into t1 values(9);
|
|
insert into t2 select * from t1;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
# Check that when the query updat1ng the MyISAM table is the first in the
|
|
# transaction, we log it immediately.
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
insert into t1 values(10); # first make t1 non-empty
|
|
begin;
|
|
insert into t2 select * from t1;
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
insert into t1 values(11);
|
|
commit;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
|
|
# Check that things work like before this BEGIN/ROLLBACK code was added,
|
|
# when t2 is INNODB
|
|
|
|
alter table t2 engine=INNODB;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(12);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(13);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(14);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(15);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(16);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(17);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(18);
|
|
commit;
|
|
select a from t1 order by a; # check that savepoints work :)
|
|
|
|
--replace_column 5 #
|
|
show binlog events from 95;
|
|
|
|
drop table t1,t2;
|