summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorpem@mysql.com <>2003-03-20 11:57:05 +0100
committerpem@mysql.com <>2003-03-20 11:57:05 +0100
commit0d95f36a12bd9a5b9c71cbc6ed2f3f877e9522c0 (patch)
tree1ff2eb84da87aeb7018e7aa576dfa3a9be0868e1 /mysql-test
parent6822eb5ec0f590f35c8c4ce1020f1a68c1f8904a (diff)
downloadmariadb-git-0d95f36a12bd9a5b9c71cbc6ed2f3f877e9522c0.tar.gz
Post post merge fix. Made the broken ip test work again.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/sp.result6
-rw-r--r--mysql-test/t/sp.test5
2 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index a7d28407385..b188a6ed57d 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -484,6 +484,12 @@ set p = p+2;
end;
end while;
end;
+call ip(200);
+select * from primes where i=45 or i=100 or i=199;
+i p
+45 211
+100 557
+199 1229
drop table primes;
drop procedure opp;
drop procedure ip;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index bcde9e5102c..0d6a84fa63b 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -564,11 +564,10 @@ end|
# This isn't the fastest way in the world to compute prime numbers, so
# don't be too ambition. ;-)
-#QQ Something broke after the last merge. :-( /2003-03-19
-#QQ call ip(200)|
+call ip(200)|
# We don't want to select the entire table here, just pick a few
# examples.
-#QQ select * from primes where i=45 or i=100 or i=199|
+select * from primes where i=45 or i=100 or i=199|
drop table primes|
drop procedure opp|
drop procedure ip|