Commit 453eea9b authored by unknown's avatar unknown
Browse files

Implemented requested changes by Lars and did some general test cleanup. Lots more togo 


mysql-test/t/rpl_relay_space_myisam.test:
  Added Comment
mysql-test/t/rpl_ndb_relay_space.test:
  Added more comments
BitKeeper/deleted/.del-rpl_relay_space_ndb.result~4d6013c0afef9b5e:
  Delete: mysql-test/r/rpl_relay_space_ndb.result
mysql-test/t/rpl_relay_space_innodb.test:
  Added Comment
BitKeeper/deleted/.del-rpl000006.test~6da9f1808deb79c7:
  Delete: mysql-test/t/rpl000006.test
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
  Delete: mysql-test/t/rpl000004.test
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
  Delete: mysql-test/r/rpl000004.result
mysql-test/t/rpl_mixed_ddl_dml.test:
  Rename: mysql-test/t/rpl000002.test -> mysql-test/t/rpl_mixed_ddl_dml.test
mysql-test/r/rpl_mixed_ddl_dml.result:
  Rename: mysql-test/r/rpl000002.result -> mysql-test/r/rpl_mixed_ddl_dml.result
mysql-test/t/rpl_ignore_table_update.test:
  Rename: mysql-test/t/rpl000008.test -> mysql-test/t/rpl_ignore_table_update.test
mysql-test/t/rpl_ignore_table_update-slave.opt:
  Rename: mysql-test/t/rpl000008-slave.opt -> mysql-test/t/rpl_ignore_table_update-slave.opt
mysql-test/r/rpl_ignore_table_update.result:
  Rename: mysql-test/r/rpl000008.result -> mysql-test/r/rpl_ignore_table_update.result
mysql-test/t/rpl_load_table_from_master.test:
  Fixing test since test where combined
mysql-test/r/rpl_load_table_from_master.result:
  Updated results file
BitKeeper/deleted/.del-rpl000004.a.result~3415f066cb91c460:
  Delete: mysql-test/r/rpl000004.a.result
BitKeeper/deleted/.del-rpl000004.b.result~352b35351551485:
  Delete: mysql-test/r/rpl000004.b.result
mysql-test/t/disabled.def:
  added rpl_ndb_relay_space Results are not deterministic
mysql-test/t/rpl_load_from_master.test:
  Rename: mysql-test/t/rpl000009.test -> mysql-test/t/rpl_load_from_master.test
mysql-test/t/rpl_load_from_master-slave.opt:
  Rename: mysql-test/t/rpl000009-slave.opt -> mysql-test/t/rpl_load_from_master-slave.opt
mysql-test/r/rpl_load_from_master.result:
  Rename: mysql-test/r/rpl000009.result -> mysql-test/r/rpl_load_from_master.result
mysql-test/t/rpl_temp_table.test:
  Rename: mysql-test/t/rpl_000012.test -> mysql-test/t/rpl_temp_table.test
mysql-test/r/rpl_temp_table.result:
  Rename: mysql-test/r/rpl_000012.result -> mysql-test/r/rpl_temp_table.result
parent 9c5dbcc8

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))ENGINE=MyISAM;

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;

mysql-test/r/rpl000009.result→mysql-test/r/rpl_load_from_master.result

+8 −8
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ drop database if exists mysqltest3; 
create database mysqltest2;

create database mysqltest;

create database mysqltest2;

create table mysqltest2.foo (n int);

create table mysqltest2.foo (n int)ENGINE=MyISAM;

insert into mysqltest2.foo values(4);

create table mysqltest2.foo (n int);

create table mysqltest2.foo (n int)ENGINE=MyISAM;

insert into mysqltest2.foo values(5);

create table mysqltest.bar (m int);

create table mysqltest.bar (m int)ENGINE=MyISAM;

insert into mysqltest.bar values(15);

select mysqltest2.foo.n,mysqltest.bar.m from mysqltest2.foo,mysqltest.bar;

n	m
@@ -55,17 +55,17 @@ cluster_replication 
mysql

test

create database mysqltest2;

create table mysqltest2.t1(n int, s char(20));

create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;

insert into mysqltest2.t1 values (1, 'original foo.t1');

create table mysqltest2.t3(n int, s char(20));

create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM;

insert into mysqltest2.t3 values (1, 'original foo.t3');

create database mysqltest3;

create table mysqltest3.t1(n int, s char(20));

create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM;

insert into mysqltest3.t1 values (1, 'original foo2.t1');

create database mysqltest;

create table mysqltest.t1(n int, s char(20));

create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;

insert into mysqltest.t1 values (1, 'original bar.t1');

create table mysqltest.t3(n int, s char(20));

create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM;

insert into mysqltest.t3 values (1, 'original bar.t3');

load data from master;

show databases;