diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
| commit | 9cd171e2dc8743f96c710039e7348426e9bff045 (patch) | |
| tree | cf5c75ae32d43145e6aabe382f84c222a2328a7d /mysql-test/r | |
| parent | 1535da6592ed6e0ca63a06c46a123a77b30879b3 (diff) | |
| parent | 48759d7ae9522b2dc03d058c33e8b45471263fc3 (diff) | |
| download | mariadb-git-9cd171e2dc8743f96c710039e7348426e9bff045.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl_insert_id.result | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result index d0360c8b9a3..d133a2ae8ed 100644 --- a/mysql-test/r/rpl_insert_id.result +++ b/mysql-test/r/rpl_insert_id.result @@ -272,6 +272,7 @@ DROP TABLE t1, t2; DROP PROCEDURE IF EXISTS p1; DROP FUNCTION IF EXISTS f1; DROP FUNCTION IF EXISTS f2; +DROP FUNCTION IF EXISTS f3; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, @@ -295,6 +296,11 @@ RETURN 0; END | CREATE FUNCTION f2() RETURNS INT NOT DETERMINISTIC RETURN LAST_INSERT_ID() | +CREATE FUNCTION f3() RETURNS INT MODIFIES SQL DATA +BEGIN +INSERT INTO t2 (i) VALUES (LAST_INSERT_ID()); +RETURN 0; +END | INSERT INTO t1 VALUES (NULL, -1); CALL p1(); SELECT f1(); @@ -307,6 +313,11 @@ INSERT INTO t1 VALUES (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID(5)), (NULL, @@LAST_INSERT_ID); INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID()); UPDATE t1 SET j= -1 WHERE i IS NULL; +INSERT INTO t1 (i) VALUES (NULL); +INSERT INTO t1 (i) VALUES (NULL); +SELECT f3(); +f3() +0 SELECT * FROM t1; i j 1 -1 @@ -327,12 +338,15 @@ i j 16 13 17 -1 18 14 +19 0 +20 0 SELECT * FROM t2; i 2 3 5 6 +19 SELECT * FROM t1; i j 1 -1 @@ -353,15 +367,19 @@ i j 16 13 17 -1 18 14 +19 0 +20 0 SELECT * FROM t2; i 2 3 5 6 +19 DROP PROCEDURE p1; DROP FUNCTION f1; DROP FUNCTION f2; +DROP FUNCTION f3; DROP TABLE t1, t2; # End of 5.0 tests |