Commit d141cb0d authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl


sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
parents bd299fdf 09f3dda7

mysql-test/r/rpl_misc_functions.result

+25 −2
Original line number Diff line number Diff line
@@ -18,6 +18,29 @@ create table t2 like t1; 
load data local infile 'MYSQLTEST_VARDIR/master-data/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

stop slave;

drop table t1;

drop table t1;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (col_a double default NULL);

CREATE PROCEDURE test_replication_sp1()

BEGIN

INSERT INTO t1 VALUES (rand()), (rand());

INSERT INTO t1 VALUES (rand());

END|

CREATE PROCEDURE test_replication_sp2()

BEGIN

CALL test_replication_sp1();

CALL test_replication_sp1();

END|

CREATE FUNCTION test_replication_sf() RETURNS DOUBLE DETERMINISTIC

BEGIN

RETURN (rand() + rand());

END|

CALL test_replication_sp1();

CALL test_replication_sp2();

INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());

DROP PROCEDURE IF EXISTS test_replication_sp1;

DROP PROCEDURE IF EXISTS test_replication_sp2;

DROP FUNCTION IF EXISTS test_replication_sf;

DROP TABLE IF EXISTS t1;

mysql-test/r/rpl_ndb_basic.result

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ Replicate_Do_Table 
Replicate_Ignore_Table	<Replicate_Ignore_Table>

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	146

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1

Last_Errno	1105

Last_Error	Unknown error

Skip_Counter	0

Exec_Master_Log_Pos	<Exec_Master_Log_Pos>

Relay_Log_Space	<Relay_Log_Space>

mysql-test/r/rpl_row_tabledefs_2myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1364

Last_Errno	1105

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1_nodef

Skip_Counter	0

Exec_Master_Log_Pos	#

mysql-test/r/rpl_row_tabledefs_3innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1364

Last_Errno	1105

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1_nodef

Skip_Counter	0

Exec_Master_Log_Pos	#

mysql-test/t/rpl_misc_functions.test

+66 −2
Original line number Diff line number Diff line
@@ -28,10 +28,74 @@ create table t2 like t1; 
eval load data local infile '$MYSQLTEST_VARDIR/master-data/test/rpl_misc_functions.outfile' into table t2;

# compare them with the replica; the SELECT below should return no row

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);

stop slave;

drop table t1;



connection master;

drop table t1;



# End of 4.1 tests



#

# BUG#25543 test calling rand() multiple times on the master in

# a stored procedure.

#



--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



CREATE TABLE t1 (col_a double default NULL);



DELIMITER |;



# Use a SP that calls rand() multiple times

CREATE PROCEDURE test_replication_sp1()

BEGIN

 INSERT INTO t1 VALUES (rand()), (rand());

 INSERT INTO t1 VALUES (rand());

END|



# Use a SP that calls another SP to call rand() multiple times

CREATE PROCEDURE test_replication_sp2()

BEGIN

  CALL test_replication_sp1();

  CALL test_replication_sp1();

END|



# Use a SF that calls rand() multiple times

CREATE FUNCTION test_replication_sf() RETURNS DOUBLE DETERMINISTIC

BEGIN

 RETURN (rand() + rand());

END|



DELIMITER ;|



# Exercise the functions and procedures then compare the results on

# the master to those on the slave.

CALL test_replication_sp1();

CALL test_replication_sp2();

INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());

INSERT INTO t1 VALUES (test_replication_sf());



# Record the results of the query on the master

--exec $MYSQL --port=$MASTER_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql



--sync_slave_with_master



# Record the results of the query on the slave

--exec $MYSQL --port=$SLAVE_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql



# Compare the results from the master to the slave.

--exec diff $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql



# Cleanup

--disable_warnings

DROP PROCEDURE IF EXISTS test_replication_sp1;

DROP PROCEDURE IF EXISTS test_replication_sp2;

DROP FUNCTION IF EXISTS test_replication_sf;

DROP TABLE IF EXISTS t1;

--enable_warnings



# If all is good, when can cleanup our dump files.

--system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql

--system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql