From 0183ec75e18c5725300a61afd92f93396d56acef Mon Sep 17 00:00:00 2001
From: unknown <petr@mysql.com>
Date: Wed, 24 Aug 2005 12:25:57 +0400
Subject: [PATCH] fix test for a bug to use correct tables

mysql-test/r/sp.result:
  fix result
mysql-test/t/sp.test:
  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 | 33 +++++++++++++++++----------------
 mysql-test/t/sp.test   | 33 +++++++++++++++++----------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index d1d41035475..423cd546a84 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -3101,16 +3101,16 @@ call p_bug11247(10)|
 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 @@ fetch c1 into c;
 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 @@ fetch c2 into c;
 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;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index f3e7c3e07a0..abff597405b 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -3934,20 +3934,20 @@ drop procedure p_bug11247|
 #
 --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 @@ begin
           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 @@ begin
           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 @@ begin
 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|
 
 #