summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-10-27 23:31:24 +0300
committerbell@sanja.is.com.ua <>2004-10-27 23:31:24 +0300
commit75f7235e8d437a7d5d1154876430ae44ee70549b (patch)
tree03a9f14838cbcfdc6f8464b9119b9d9e3428a3be /mysql-test/t
parentf96d99eba18199b3aec4eb1a384dae09041e9dea (diff)
parent9aa2d5f7508dbc5571eedf569ddf1182fcb764ba (diff)
downloadmariadb-git-75f7235e8d437a7d5d1154876430ae44ee70549b.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/subselect.test5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 5e3aa4064e4..e0f6fcbf515 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -543,8 +543,8 @@ drop table t1, t2;
CREATE TABLE `t1` (`i` int(11) NOT NULL default '0',PRIMARY KEY (`i`)) ENGINE=MyISAM CHARSET=latin1;
INSERT INTO t1 VALUES (1);
--- error 1111
UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
+select * from t1;
drop table t1;
#test of uncacheable subqueries
@@ -689,12 +689,11 @@ CREATE TABLE `t1` (
) ENGINE=MyISAM CHARSET=latin1;
INSERT INTO t1 VALUES (1);
--- error 1111
UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
--- error 1111
UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
-- error 1109
UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
+select * from t1;
drop table t1;
#