Made stored FUNCTION invokation work almost always. Still buggy and unstable, and

various known problems, but good enough for a checkpoint commit.

1 files changed, 19 insertions, 3 deletions

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index ba2709ebb7e..7beaa9fe673 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -375,11 +375,21 @@ create table test.t2 select * from test.t1;
 insert into test.t2 values (concat(x, "2"), y+2);
 end;
 drop procedure create_select;
-create function foo returns real soname "foo.so";
-Can't open shared library 'foo.so' (errno: 22 foo.so: cannot open shared object file: No such file or director)
 create function e() returns double
 return 2.7182818284590452354;
-drop function e;
+select e();
+e()
+2.718281828459
+create function inc(i int) returns int
+return i+1;
+select inc(1), inc(99), inc(-71);
+inc(1)	inc(99)	inc(-71)
+2	100	-70
+create function mul(x int, y int) returns int
+return x*y;
+select mul(1,1), mul(3,5), mul(4711, 666);
+mul(1,1)	mul(3,5)	mul(4711, 666)
+1	15	3137526
 create function fac(n int unsigned) returns bigint unsigned
 begin
 declare f bigint unsigned;
@@ -390,5 +400,11 @@ set n = n - 1;
 end while;
 return f;
 end;
+select fac(1), fac(2), fac(10);
+fac(1)	fac(2)	fac(10)
+1	2	3628800
+drop function e;
+drop function inc;
+drop function mul;
 drop function fac;
 drop table t1;