summaryrefslogtreecommitdiff
path: root/mysql-test/r/update.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r/update.result')
-rw-r--r--mysql-test/r/update.result8
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 49141e33709..73ebb73e313 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -487,6 +487,8 @@ a quux
2 0.100000000000000000000000000000
3 NULL
DROP TABLE t1;
+connect con1,localhost,root,,test;
+connection con1;
set tmp_table_size=1024;
create table t1 (id int, a int, key idx(a));
create table t2 (id int unsigned not null auto_increment primary key, a int);
@@ -521,15 +523,17 @@ update t1 join t2 on (t1.a=t2.a) set t1.id=t2.id;
affected rows: 127
info: Rows matched: 128 Changed: 127 Warnings: 0
drop table t1,t2;
+connection default;
+disconnect con1;
DROP TABLE IF EXISTS t1;
DROP FUNCTION IF EXISTS f1;
CREATE FUNCTION f1() RETURNS INT RETURN f1();
CREATE TABLE t1 (i INT);
INSERT INTO t1 VALUES (1);
UPDATE t1 SET i = 3 WHERE f1();
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
UPDATE t1 SET i = f1();
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
DROP TABLE t1;
DROP FUNCTION f1;
End of 5.0 tests