1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726


sql/item_func.cc:
  Use local.
sql/log.cc:
  Use local.
sql/set_var.cc:
  Use local.
sql/sql_class.cc:
  Use local.
sql/sql_class.h:
  Use local.
sql/sql_parse.cc:
  Use local.
sql/sql_select.cc:
  Use local.
mysql-test/r/rpl_insert_id.result:
  Use local.
mysql-test/t/rpl_insert_id.test:
  Add result for updated test.
This commit is contained in:
unknown 2006-10-03 16:47:40 +04:00
commit af9e2eb134
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/r/rpl_insert_id.result
View File

@ -301,6 +301,7 @@ DROP TABLE t1, t2;
DROP PROCEDURE IF EXISTS p1; DROP PROCEDURE IF EXISTS p1;
DROP FUNCTION IF EXISTS f1; DROP FUNCTION IF EXISTS f1;
DROP FUNCTION IF EXISTS f2; DROP FUNCTION IF EXISTS f2;
DROP FUNCTION IF EXISTS f3;
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 ( CREATE TABLE t1 (
i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, i INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
@ -324,6 +325,11 @@ RETURN 0;
END | END |
CREATE FUNCTION f2() RETURNS INT NOT DETERMINISTIC CREATE FUNCTION f2() RETURNS INT NOT DETERMINISTIC
RETURN LAST_INSERT_ID() | 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); INSERT INTO t1 VALUES (NULL, -1);
CALL p1(); CALL p1();
SELECT f1(); SELECT f1();
@ -336,6 +342,11 @@ INSERT INTO t1 VALUES (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID(5)),
(NULL, @@LAST_INSERT_ID); (NULL, @@LAST_INSERT_ID);
INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID()); INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID());
UPDATE t1 SET j= -1 WHERE i IS NULL; 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; SELECT * FROM t1;
i j i j
1 -1 1 -1
@ -356,12 +367,15 @@ i j
16 13 16 13
17 -1 17 -1
18 14 18 14
19 0
20 0
SELECT * FROM t2; SELECT * FROM t2;
i i
2 2
3 3
5 5
6 6
19
SELECT * FROM t1; SELECT * FROM t1;
i j i j
1 -1 1 -1
@ -382,15 +396,19 @@ i j
16 13 16 13
17 -1 17 -1
18 14 18 14
19 0
20 0
SELECT * FROM t2; SELECT * FROM t2;
i i
2 2
3 3
5 5
6 6
19
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP FUNCTION f1; DROP FUNCTION f1;
DROP FUNCTION f2; DROP FUNCTION f2;
DROP FUNCTION f3;
DROP TABLE t1, t2; DROP TABLE t1, t2;
# #
# End of 5.0 tests # End of 5.0 tests