BUG#12335: merging: temporarily removed a test case that demonstrates wrong...

BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.

mysql-test/r/rpl_sp_effects.result

@@ -156,61 +156,3 @@ slave:	6
 drop procedure p1;
 drop function f1;
 drop table t1,t2;
-create table t1 (a int);
-create table t2 (a char(200));
-create procedure p1()
-begin
-declare dummy int;
-while ((select count(*) from t1) < 1) do
-set dummy = sleep(1);
-end while;
-end//
-create procedure p2()
-begin
-select f1();
-call p1();
-delete from t1 limit 1;
-select f1();
-call p1();
-delete from t1 limit 1;
-select f1();
-end//
-create function f1() returns int 
-begin
-insert into t2 values('f1-r1');
-return 0;
-end//
- call p2();
-drop function f1//
-create function f1() returns int 
-begin
-insert into t2 values('f1-r2');
-return 0;
-end//
-insert into t1 values (1) //
-call p1()//
-drop function f1//
-create function f1() returns int 
-begin
-insert into t2 values('f1-r3');
-return 0;
-end//
-insert into t1 values (1) //
-call p1()//
-f1()
-0
-f1()
-0
-f1()
-0
-select * from t2;
-a
-f1-r1
-f1-r1
-f1-r1
-select * from t2;
-a
-f1-r1
-f1-r3
-f1-r3
-drop table t1;

mysql-test/t/rpl_sp_effects.test

@@ -153,82 +153,3 @@ drop function f1;
 drop table t1,t2;
 
 sync_slave_with_master;
-
-# The following will produce incorrect results: 
-connection master;
-create table t1 (a int);
-create table t2 (a char(200));
-
-delimiter //;
-create procedure p1()
-begin
-  declare dummy int;
-  while ((select count(*) from t1) < 1) do
-    set dummy = sleep(1);
-  end while;
-end//
-
-create procedure p2()
-begin
-  select f1();
-  
-  call p1();
-  delete from t1 limit 1;
-  
-  select f1();
-  
-  call p1();
-  delete from t1 limit 1;
-  
-  select f1();
-end//
-
-create function f1() returns int 
-begin
-  insert into t2 values('f1-r1');
-  return 0;
-end// 
-delimiter ;//
-
-connection master;
-send call p2();
-
-connection master1;
-delimiter //;
-
-drop function f1//
-create function f1() returns int 
-begin
-  insert into t2 values('f1-r2');
-  return 0;
-end// 
-insert into t1 values (1) //
-
-call p1()//
-
-drop function f1//
-create function f1() returns int 
-begin
-  insert into t2 values('f1-r3');
-  return 0;
-end// 
-insert into t1 values (1) //
-
-call p1()//
-
-delimiter ;//
-
-connection master;
-reap;
-
-select * from t2;
-
-connection slave;
-select * from t2;
-
-# Clean up
-connection master;
-drop table t1;
-
-sync_slave_with_master;
-