bk commit into 5.0 tree (petr:1.1917)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps 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.1917 05/08/24 12:25:57 petr@stripped +2 -0
  fix test for a bug to use correct tables

  mysql-test/t/sp.test
    1.140 05/08/24 12:25:51 petr@stripped +17 -16
    fix test for a bug: tests in sp.test should reuse tables t1 and t2 and create/drop tables t3, t4 etc.
    So, tables t1 and t2 were renamed into t3 and t4

  mysql-test/r/sp.result
    1.145 05/08/24 12:25:50 petr@stripped +17 -16
    fix result

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0

--- 1.144/mysql-test/r/sp.result	2005-08-19 17:03:12 +04:00
+++ 1.145/mysql-test/r/sp.result	2005-08-24 12:25:50 +04:00
@@ -3101,16 +3101,16 @@
 drop function f_bug11247|
 drop procedure p_bug11247|
 drop procedure if exists bug12168|
-drop table if exists t1, t2|
-create table t1 (a int)|
-insert into t1 values (1),(2),(3),(4)|
-create table t2 (a int)|
+drop table if exists t3, t4|
+create table t3 (a int)|
+insert into t3 values (1),(2),(3),(4)|
+create table t4 (a int)|
 create procedure bug12168(arg1 char(1))
 begin
 declare b, c integer;
 if arg1 = 'a' then
 begin
-declare c1 cursor for select a from t1 where a % 2;
+declare c1 cursor for select a from t3 where a % 2;
 declare continue handler for not found set b = 1;
 set b = 0;
 open c1;
@@ -3119,14 +3119,14 @@
 if (b = 1) then
 leave c1_repeat;
 end if;
-insert into t2 values (c);
+insert into t4 values (c);
 until b = 1
 end repeat;
 end;
 end if;
 if arg1 = 'b' then
 begin
-declare c2 cursor for select a from t1 where not a % 2;
+declare c2 cursor for select a from t3 where not a % 2;
 declare continue handler for not found set b = 1;
 set b = 0;
 open c2;
@@ -3135,35 +3135,36 @@
 if (b = 1) then
 leave c2_repeat;
 end if;
-insert into t2 values (c);
+insert into t4 values (c);
 until b = 1
 end repeat;
 end;
 end if;
 end|
 call bug12168('a')|
-select * from t2|
+select * from t4|
 a
 1
 3
-truncate t2|
+truncate t4|
 call bug12168('b')|
-select * from t2|
+select * from t4|
 a
 2
 4
-truncate t2|
+truncate t4|
 call bug12168('a')|
-select * from t2|
+select * from t4|
 a
 1
 3
-truncate t2|
+truncate t4|
 call bug12168('b')|
-select * from t2|
+select * from t4|
 a
 2
 4
-truncate t2|
+truncate t4|
+drop table t3, t4|
 drop procedure if exists bug12168|
 drop table t1,t2;

--- 1.139/mysql-test/t/sp.test	2005-08-19 17:03:12 +04:00
+++ 1.140/mysql-test/t/sp.test	2005-08-24 12:25:51 +04:00
@@ -3934,20 +3934,20 @@
 #
 --disable_warnings
 drop procedure if exists bug12168|
-drop table if exists t1, t2|
+drop table if exists t3, t4|
 --enable_warnings
 
-create table t1 (a int)|
-insert into t1 values (1),(2),(3),(4)|
+create table t3 (a int)|
+insert into t3 values (1),(2),(3),(4)|
 
-create table t2 (a int)|
+create table t4 (a int)|
 
 create procedure bug12168(arg1 char(1))
 begin
   declare b, c integer;
   if arg1 = 'a' then
     begin
-      declare c1 cursor for select a from t1 where a % 2;
+      declare c1 cursor for select a from t3 where a % 2;
       declare continue handler for not found set b = 1;
       set b = 0;
       open c1;
@@ -3957,14 +3957,14 @@
           leave c1_repeat;
         end if;
 
-        insert into t2 values (c);
+        insert into t4 values (c);
         until b = 1
       end repeat;
     end;
   end if;
   if arg1 = 'b' then
     begin
-      declare c2 cursor for select a from t1 where not a % 2;
+      declare c2 cursor for select a from t3 where not a % 2;
       declare continue handler for not found set b = 1;
       set b = 0;
       open c2;
@@ -3974,7 +3974,7 @@
           leave c2_repeat;
         end if;
 
-        insert into t2 values (c);
+        insert into t4 values (c);
         until b = 1
       end repeat;
     end;
@@ -3982,17 +3982,18 @@
 end|
 
 call bug12168('a')|
-select * from t2|
-truncate t2|
+select * from t4|
+truncate t4|
 call bug12168('b')|
-select * from t2|
-truncate t2|
+select * from t4|
+truncate t4|
 call bug12168('a')|
-select * from t2|
-truncate t2|
+select * from t4|
+truncate t4|
 call bug12168('b')|
-select * from t2|
-truncate t2|
+select * from t4|
+truncate t4|
+drop table t3, t4|
 drop procedure if exists bug12168|
 
 #