Commit dbcc7753 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents 6a9a35c0 32e3f461

mysql-test/extra/rpl_tests/rpl_log.test

+12 −4
Original line number Diff line number Diff line
@@ -30,21 +30,25 @@ let $VERSION=`select version()`; 


connection master;

reset master;

create table t1(n int not null auto_increment primary key);

eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;

insert into t1 values (NULL);

drop table t1;

create table t1 (word char(20) not null);

eval create table t1 (word char(20) not null)ENGINE=$engine_type;

load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;

select count(*) from t1;

drop table t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events from 102 limit 1;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events from 102 limit 2;

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events from 102 limit 2,1;

flush logs;
@@ -64,7 +68,7 @@ flush logs; 
# To make it predictable, we do a useless update now, but which has the

# interest of making the slave catch both rotate events.



create table t5 (a int);

eval create table t5 (a int)ENGINE=$engine_type;

drop table t5;



# Sync slave and force it to start on another binary log
@@ -82,14 +86,16 @@ connection master; 


# Create some entries for second log



create table t1 (n int);

eval create table t1 (n int)ENGINE=$engine_type;

insert into t1 values (1);

drop table t1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events in 'master-bin.000002';

show binary logs;

save_master_pos;
@@ -99,9 +105,11 @@ sync_with_master; 
show binary logs;

--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events in 'slave-bin.000001' from 4;

--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events in 'slave-bin.000002' from 4;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 16 # 23 # 33 #

mysql-test/t/rpl000005.test→mysql-test/extra/rpl_tests/rpl_sv_relay_space.test

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# Change Date: 2006-01-17

# Change: Added order by in select

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

# Change Date: 2006-02-02

# Change: renamed to make bettre sense,

# and wrapped per Engine test

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

source include/master-slave.inc;



#
@@ -10,7 +14,7 @@ source include/master-slave.inc; 
#

SHOW VARIABLES LIKE 'relay_log_space_limit';



CREATE TABLE t1 (name varchar(64), age smallint(3));

eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type;

INSERT INTO  t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

mysql-test/r/rpl000004.a.result

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

mysql-test/r/rpl000004.b.result

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
count(*)

10

mysql-test/r/rpl000006.result

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set SQL_LOG_BIN=0,timestamp=200006;

create table t1(t timestamp not null,a char(1));

insert into t1 ( a) values ('F');

select unix_timestamp(t) from t1;

unix_timestamp(t)

200006

load table t1 from master;

select unix_timestamp(t) from t1;

unix_timestamp(t)

200006

set SQL_LOG_BIN=1,timestamp=default;

drop table t1;

set SQL_LOG_BIN=0;

CREATE TABLE t1 (

a int not null

) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;

INSERT INTO t1 VALUES (1);

load table t1 from master;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

drop table t1;