From 3b5a741afff2f890744af2b5ef37e36077317f2f Mon Sep 17 00:00:00 2001
From: "mleich@mysql.com" <>
Date: Mon, 13 Dec 2004 21:00:43 +0100
Subject: [PATCH] Small bug fix ps-modify1 used the user variables @1, @2, @100
 set within ps_query and            ps_modify. That architecture was wrong,
 because the dependence            of ps_modify1 on ps_query and ps_modify
 makes the test script            maintenance and the use of these test cases
 during bug fixing/            debugging of single sub test cases very
 uncomfortable. Therefore these user variables (@1, @2, @100) are also set
 within ps-modify1.

The result files of the test cases ps_2myisam, ps_3innodb, ps_4heap, ps_6bdb,
ps_7ndb will be affected by that change and show 3 additional lines, but
nothing else will change.
---
 mysql-test/include/ps_modify1.inc | 3 +++
 mysql-test/r/ps_2myisam.result    | 3 +++
 mysql-test/r/ps_3innodb.result    | 3 +++
 mysql-test/r/ps_4heap.result      | 3 +++
 mysql-test/r/ps_6bdb.result       | 3 +++
 mysql-test/r/ps_7ndb.result       | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/mysql-test/include/ps_modify1.inc b/mysql-test/include/ps_modify1.inc
index 5fba7faa59a..345654b2d66 100644
--- a/mysql-test/include/ps_modify1.inc
+++ b/mysql-test/include/ps_modify1.inc
@@ -65,6 +65,9 @@ execute stmt1 using @1000, @duplicate, @5;
 select a,b from t1 where a >= 1000 order by a ;
 delete from t1 where a >= 1000 ;
 
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 --disable_warnings
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index 24c1102306f..c2799c6faed 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -1688,6 +1688,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index ad2912529a5..034cd75ea4b 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -1671,6 +1671,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 123e3d58b38..60a9ddd2bf2 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -1672,6 +1672,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result
index 5f2419bdda5..baf273c84c0 100644
--- a/mysql-test/r/ps_6bdb.result
+++ b/mysql-test/r/ps_6bdb.result
@@ -1671,6 +1671,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result
index 41c55cac0ca..3dbe3ed6218 100644
--- a/mysql-test/r/ps_7ndb.result
+++ b/mysql-test/r/ps_7ndb.result
@@ -1671,6 +1671,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;