1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merging with 5.1-rpl

This commit is contained in:
Mats Kindahl
2008-10-29 19:38:28 +01:00
47 changed files with 26 additions and 52 deletions

View File

@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT);
CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB";
SET AUTOCOMMIT = 0;
-------- switch to slave --------
ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
SHOW CREATE TABLE mysqltest1.t1;
Table Create Table
t1 CREATE TABLE `t1` (

View File

@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
@ -85,7 +85,7 @@ t2 CREATE TABLE `t2` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
******************** DDL for indexes ********************
ALTER TABLE t2 ADD COLUMN d datetime;
@ -120,7 +120,7 @@ t1 CREATE TABLE `t1` (
`b` char(254) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `index1` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
@ -131,7 +131,7 @@ t2 CREATE TABLE `t2` (
KEY `index1` (`b`),
KEY `index2` (`d`),
KEY `index3` (`a`,`d`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
ALTER TABLE t2 DROP COLUMN d;

View File

@ -8,6 +8,8 @@
log-bin= master-bin
loose-innodb
[mysqld.2]
# Run the slave.sh script before starting this process
#!run-slave-sh
@ -39,7 +41,7 @@ slave-load-tmpdir= ../../tmp
rpl-recovery-rank= @mysqld.2.server-id
loose-skip-innodb
loose-innodb
[ENV]

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +1 @@
--innodb --innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1,2 +0,0 @@
--innodb

View File

@ -1,2 +1 @@
--slave-exec-mode=IDEMPOTENT --innodb
--slave-exec-mode=IDEMPOTENT

View File

@ -1 +1 @@
--innodb --innodb_autoinc_lock_mode=0
--innodb_autoinc_lock_mode=0

View File

@ -74,6 +74,17 @@ SET AUTOCOMMIT = 0;
sync_slave_with_master;
--echo -------- switch to slave --------
connection slave;
# We want to verify that the following transactions are written to the
# binlog, despite the transaction is rolled back. (The should be
# written to the binlog since they contain non-transactional DROP
# TEMPORARY TABLE). To see that, we use the auxiliary table t1, which
# is transactional (InnoDB) on master and MyISAM on slave. t1 should
# be transactional on master so that the insert into t1 does not cause
# the transaction to be logged. Since t1 is non-transactional on
# slave, the change will not be rolled back, so the inserted rows will
# stay in t1 and we can verify that the transaction was replicated.
ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;
SHOW CREATE TABLE mysqltest1.t1;
--echo -------- switch to master --------
@ -100,8 +111,7 @@ connection slave;
SHOW CREATE TABLE mysqltest1.tmp;
--error ER_NO_SUCH_TABLE
SHOW CREATE TABLE mysqltest1.tmp2;
# has two rows here : as the default is MyISAM and
# it can't be rolled back by the master's ROLLBACK.
# t1 has two rows here: the transaction not rolled back since t1 uses MyISAM
SELECT COUNT(*) FROM mysqltest1.t1;
FLUSH LOGS;

View File

@ -1 +1 @@
--innodb --innodb_autoinc_lock_mode=0
--innodb_autoinc_lock_mode=0

View File

@ -1 +1 @@
--innodb --innodb_autoinc_lock_mode=0
--innodb_autoinc_lock_mode=0

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1,3 +1,2 @@
-O max_relay_log_size=16384
--loose-innodb
--log-warnings

View File

@ -1,2 +1,2 @@
--binlog_ignore_db=test_ignore --loose-innodb
--binlog_ignore_db=test_ignore

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--loose-innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--innodb

View File

@ -1 +0,0 @@
--loose-innodb