From: Date: August 25 2005 4:14pm
Subject: bk commit into 5.0 tree (sergefp:1.1923) BUG#12335
List-Archive: http://lists.mysql.com/internals/28837
X-Bug: 12335
Message-Id: <20050825141404.8A07337AEA@newbox.mylan>

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1923 05/08/25 18:13:56 sergefp@stripped +2 -0
  BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.

  mysql-test/t/rpl_sp_effects.test
    1.2 05/08/25 18:13:51 sergefp@stripped +0 -79
    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
    1.2 05/08/25 18:13:51 sergefp@stripped +0 -58
    BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug12335-release2

--- 1.1/mysql-test/r/rpl_sp_effects.result	2005-08-25 17:34:14 +04:00
+++ 1.2/mysql-test/r/rpl_sp_effects.result	2005-08-25 18:13:51 +04:00
@@ -156,61 +156,3 @@
 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;

--- 1.1/mysql-test/t/rpl_sp_effects.test	2005-08-25 17:34:16 +04:00
+++ 1.2/mysql-test/t/rpl_sp_effects.test	2005-08-25 18:13:51 +04:00
@@ -153,82 +153,3 @@
 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;
-