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

Post-merge fixes.

Browse Source 
mysql-test/extra/rpl_tests/rpl_log.test:
  Removing extreneous start slave.
  Added missing drop of table t1.
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test:
  Replaced $MYSQLTEST_VARDIR/log with $MYSQLD_DATADIR
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Using temporary table instead to remove need for drop table.
This commit is contained in:
Mats Kindahl
2008-10-07 10:25:12 +02:00
parent 87b91e547d
commit 1a06250902
6 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/extra/rpl_tests/rpl_log.test
View File

@ -70,11 +70,7 @@ eval create table t3 (a int)ENGINE=$engine_type;
connection master; connection master;
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
save_master_pos; sync_slave_with_master;
connection slave;
source include/start_slave.inc;
sync_with_master;
#check t1 on slave to ensure whether it's identical with on master #check t1 on slave to ensure whether it's identical with on master
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
flush logs; flush logs;
@ -142,4 +138,4 @@ drop table t1;
# End of 4.1 tests # End of 4.1 tests
sync_slave_with_master; sync_slave_with_master;
drop table t1;

2
mysql-test/suite/rpl/r/rpl_row_log.result
View File

@ -113,7 +113,6 @@ Aberdeen
Abernathy Abernathy
aberrant aberrant
aberration aberration
include/start_slave.inc
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
word word
Aarhus Aarhus
@ -306,3 +305,4 @@ a b
5 1 5 1
6 1 6 1
drop table t1; drop table t1;
drop table t1;

2
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View File

@ -113,7 +113,6 @@ Aberdeen
Abernathy Abernathy
aberrant aberrant
aberration aberration
include/start_slave.inc
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
word word
Aarhus Aarhus
@ -306,3 +305,4 @@ a b
5 1 5 1
6 1 6 1
drop table t1; drop table t1;
drop table t1;

2
mysql-test/suite/rpl/r/rpl_stm_log.result
View File

@ -109,7 +109,6 @@ Aberdeen
Abernathy Abernathy
aberrant aberrant
aberration aberration
include/start_slave.inc
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
word word
Aarhus Aarhus
@ -287,3 +286,4 @@ a b
5 1 5 1
6 1 6 1
drop table t1; drop table t1;
drop table t1;

3
mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test
View File

@ -16,8 +16,9 @@ reset master;
create table t1 (a int); create table t1 (a int);
insert into t1 values (1); insert into t1 values (1);
let $MYSQLD_DATADIR= `select @@datadir`;
flush logs; flush logs;
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql
drop table t1; drop table t1;
--exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql" --exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql"

2
mysql-test/suite/rpl/t/rpl_misc_functions.test
View File

@ -23,7 +23,7 @@ insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('do
select * into outfile 'rpl_misc_functions.outfile' from t1; select * into outfile 'rpl_misc_functions.outfile' from t1;
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
sync_slave_with_master; sync_slave_with_master;
create table t2 like t1; create temporary table t2 like t1;
# read the values from the master table # read the values from the master table
--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
eval load data local infile '$MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2; eval load data local infile '$MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2;