diff options
author | unknown <jmiller@mysql.com> | 2006-02-03 15:38:27 +0100 |
---|---|---|
committer | unknown <jmiller@mysql.com> | 2006-02-03 15:38:27 +0100 |
commit | 453eea9b9ce99dba127d3050d256ba9576b40800 (patch) | |
tree | 41f3d4f80e8835a11034174730a230171101a6f4 /mysql-test/r/rpl000009.result | |
parent | 9c5dbcc8e23390b609114fc2054fb1b47c2f4c7d (diff) | |
download | mariadb-git-453eea9b9ce99dba127d3050d256ba9576b40800.tar.gz |
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
Diffstat (limited to 'mysql-test/r/rpl000009.result')
-rw-r--r-- | mysql-test/r/rpl000009.result | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result deleted file mode 100644 index 27569a087da..00000000000 --- a/mysql-test/r/rpl000009.result +++ /dev/null @@ -1,142 +0,0 @@ -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; -drop database if exists mysqltest; -drop database if exists mysqltest2; -drop database if exists mysqltest3; -drop database if exists mysqltest; -drop database if exists mysqltest2; -drop database if exists mysqltest3; -create database mysqltest2; -create database mysqltest; -create database mysqltest2; -create table mysqltest2.foo (n int); -insert into mysqltest2.foo values(4); -create table mysqltest2.foo (n int); -insert into mysqltest2.foo values(5); -create table mysqltest.bar (m int); -insert into mysqltest.bar values(15); -select mysqltest2.foo.n,mysqltest.bar.m from mysqltest2.foo,mysqltest.bar; -n m -4 15 -drop database mysqltest; -drop database if exists mysqltest2; -drop database mysqltest; -ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist -drop database mysqltest2; -set sql_log_bin = 0; -create database mysqltest2; -create database mysqltest; -show databases; -Database -information_schema -cluster_replication -mysql -mysqltest -mysqltest2 -test -create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; -create table mysqltest2.t2(n int, s text)ENGINE=MyISAM; -insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); -insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); -create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM; -create table mysqltest.t2(n int, s text)ENGINE=MyISAM; -insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test'); -insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), -(13, 'thirteen test'); -set sql_log_bin = 1; -show databases; -Database -information_schema -cluster_replication -mysql -test -create database mysqltest2; -create table mysqltest2.t1(n int, s char(20)); -insert into mysqltest2.t1 values (1, 'original foo.t1'); -create table mysqltest2.t3(n int, s char(20)); -insert into mysqltest2.t3 values (1, 'original foo.t3'); -create database mysqltest3; -create table mysqltest3.t1(n int, s char(20)); -insert into mysqltest3.t1 values (1, 'original foo2.t1'); -create database mysqltest; -create table mysqltest.t1(n int, s char(20)); -insert into mysqltest.t1 values (1, 'original bar.t1'); -create table mysqltest.t3(n int, s char(20)); -insert into mysqltest.t3 values (1, 'original bar.t3'); -load data from master; -show databases; -Database -information_schema -cluster_replication -mysql -mysqltest -mysqltest2 -mysqltest3 -test -use mysqltest2; -show tables; -Tables_in_mysqltest2 -t1 -t3 -select * from t1; -n s -1 original foo.t1 -use mysqltest3; -show tables; -Tables_in_mysqltest3 -t1 -select * from t1; -n s -1 original foo2.t1 -use mysqltest; -show tables; -Tables_in_mysqltest -t1 -t2 -t3 -select * from mysqltest.t1; -n s -1 one test -2 two test -3 three test -select * from mysqltest.t2; -n s -11 eleven test -12 twelve test -13 thirteen test -select * from mysqltest.t3; -n s -1 original bar.t3 -insert into mysqltest.t1 values (4, 'four test'); -select * from mysqltest.t1; -n s -1 one test -2 two test -3 three test -4 four test -stop slave; -reset slave; -load data from master; -start slave; -insert into mysqltest.t1 values (5, 'five bar'); -select * from mysqltest.t1; -n s -1 one test -2 two test -3 three test -4 four test -5 five bar -load table mysqltest.t1 from master; -ERROR 42S01: Table 't1' already exists -drop table mysqltest.t1; -load table mysqltest.t1 from master; -load table bar.t1 from master; -ERROR HY000: Error from master: 'Table 'bar.t1' doesn't exist' -drop database mysqltest; -drop database mysqltest2; -drop database mysqltest2; -drop database mysqltest3; |