mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Magnus Svensson 2008-10-08 22:00:57 +02:00
commit b6d6062d8d
8 changed files with 10 additions and 13 deletions
Show stats 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;
select * from t1 order by 1 asc;
save_master_pos;
connection slave;
source include/start_slave.inc;
sync_with_master;
sync_slave_with_master;
#check t1 on slave to ensure whether it's identical with on master
select * from t1 order by 1 asc;
flush logs;
@ -142,4 +138,4 @@ drop table t1;
# End of 4.1 tests
sync_slave_with_master;
drop table t1;

2
mysql-test/suite/rpl/r/rpl_misc_functions.result
View file

@ -14,7 +14,7 @@ set sql_log_bin=1;
insert into t1 values(3, 0, 0, 0, password('does_this_work?'));
insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?'));
select * into outfile 'rpl_misc_functions.outfile' from t1;
create table t2 like t1;
create temporary table t2 like t1;
load data local infile 'MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2;
select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t1.r2=t2.r2 and t1.p=t2.p);
id i r1 r2 p id i r1 r2 p

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

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

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

@ -109,7 +109,6 @@ Aberdeen
Abernathy
aberrant
aberration
include/start_slave.inc
select * from t1 order by 1 asc;
word
Aarhus
@ -287,3 +286,4 @@ a b
5 1
6 1
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);
insert into t1 values (1);
let $MYSQLD_DATADIR= `select @@datadir`;
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;
--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;
let $MYSQLD_DATADIR= `select @@datadir`;
sync_slave_with_master;
create table t2 like t1;
create temporary table t2 like t1;
# read the values from the master table
--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
eval load data local infile '$MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2;

2
mysql-test/suite/rpl/t/rpl_ps.test
View file

@ -123,7 +123,7 @@ DROP DATABASE mysqltest1;
--echo
use test;
DROP TABLE t1;
--echo
--save_master_pos