Commit 8c4fe301 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1 

into mysql.com:/home/bk/b6883-mysql-4.1
parents 53a92c87 0d2788ba

mysql-test/include/rpl_stmt_seq.inc

0 → 100644
+180 −0
Original line number Diff line number Diff line 
# include/rpl_stmt_seq.inc

#

# Please be very careful when editing this routine, because the handling of 

# the $variables is extreme sensitive. 

#



######## The typical test sequence

# 1. INSERT without commit

#    check table content of master and slave

# 2. EXECUTE the statement

#    check table content of master and slave

# 3. ROLLBACK

#    check table content of master and slave

# 4. flush the logs



let $VERSION=`select version()`;



--disable_query_log

# SELECT '######## new test sequence ########' as "";

eval SELECT CONCAT('######## ','$my_stmt','  ########') as "";

--enable_query_log





###############################################################

# Predict the number of the current log

###############################################################

# Disable the logging of the log number computation. 

--disable_query_log

# $_log_num_n should contain the number of the current binlog in numeric style.

# If this routine is called for the first time, $_log_num will not initialized

# and contain the value '' instead of '1'. So we will correct it here.

#

eval set @aux= IF('$_log_num_n' = '', '1', '$_log_num_n');

let $_log_num_n= `SELECT @aux`;

eval set @aux= LPAD('$_log_num_n',6,'0');

#              SELECT @aux AS "@aux is";

#

# $_log_num_s should contain the number of the current binlog in string style.

let $_log_num_s= `select @aux`;

# eval SELECT '$log_num' ;

--enable_query_log



###############################################################

# INSERT 

###############################################################

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log

# Maybe it would be smarter to use a table with autoincrement column.

let $MAX= `SELECT MAX(f1) FROM t1` ;

eval INSERT INTO t1 SET f1= $MAX + 1;

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

sync_slave_with_master;



connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';



###############################################################

# command to be tested

###############################################################

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log

eval $my_stmt;

# Devaluate $my_stmt, to detect script bugs

let $my_stmt= ERROR: YOU FORGOT TO FILL IN THE STATEMENT;

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

sync_slave_with_master;



connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';



###############################################################

# ROLLBACK

###############################################################

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log

ROLLBACK;

# results after final ROLLBACK

SELECT MAX(f1) FROM t1;

# Try to detect if the DDL command caused that the INSERT is committed

# $MAX holds the highest/last value just before the insert of MAX + 1

--disable_query_log

eval SELECT CONCAT(CONCAT('TEST-INFO: MASTER: The INSERT is ',

               IF(MAX(f1) = $MAX + 1, 'committed', 'not committed')),

               IF((MAX(f1) = $MAX + 1) XOR NOT $my_master_commit,

                ' (Succeeded)',

                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

sync_slave_with_master;



connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

# results after final ROLLBACK

SELECT MAX(f1) FROM t1;

--disable_query_log

eval SELECT CONCAT(CONCAT('TEST-INFO: SLAVE:  The INSERT is ',

               IF(MAX(f1) = $MAX + 1, 'committed', 'not committed')),

               IF((MAX(f1) = $MAX + 1) XOR NOT $my_slave_commit,

                ' (Succeeded)',

                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';



###############################################################

# Manipulate binlog

###############################################################

#let $manipulate= 0;

let $manipulate= 1;

while ($manipulate)

{

#### Manipulate the binary logs,

# so that the output of SHOW BINLOG EVENTS IN <current log>

# contains only commands of the current test sequence.

# - flush the master and the slave log

#   ---> both start to write into new logs with incremented number

# - increment $_log_num_n

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log

flush logs;

# sleep 1;

# eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

sync_slave_with_master;



connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

# the final content of the binary log

flush logs;

# The next sleep is urgent needed.

# Without this sleep the slaves crashes often, when the SHOW BINLOG

# is executed.   :-(

# sleep 1;

# eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

inc $_log_num_n;

let $manipulate= 0;

}



connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log

mysql-test/r/innodb.result

+3 −4
Original line number Diff line number Diff line
@@ -875,7 +875,6 @@ set autocommit=0; 
create table t1 (a int not null) engine= innodb;

insert into t1 values(1),(2);

truncate table t1;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

commit;

truncate table t1;

truncate table t1;
@@ -1598,14 +1597,14 @@ t2 CREATE TABLE `t2` ( 
drop table t2, t1;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	24

Binlog_cache_use	25

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	0

create table t1 (a int) engine=innodb;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	25

Binlog_cache_use	26

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1
@@ -1614,7 +1613,7 @@ delete from t1; 
commit;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	26

Binlog_cache_use	27

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1

mysql-test/r/innodb_cache.result

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ a 
3

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

Qcache_queries_in_cache	1

drop table t1;

commit;

create table t1 (a int not null) engine=innodb;

mysql-test/r/rpl_ddl.result

0 → 100644
+1662 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/t/innodb.test

+0 −1
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ show tables from mysqltest; 
set autocommit=0;

create table t1 (a int not null) engine= innodb;

insert into t1 values(1),(2);

--error 1192

truncate table t1;

commit;

truncate table t1;