summaryrefslogtreecommitdiff
path: root/mysql-test/t/multi_update.test
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-11-05 17:29:47 +0200
committerunknown <bell@sanja.is.com.ua>2004-11-05 17:29:47 +0200
commit8b0ece5e88de965aeb2af410d193bf8c6d96dcde (patch)
tree7c3c0f2fa9d3f0ef56c352118e5174450230fec2 /mysql-test/t/multi_update.test
parente981c836104675533a2eb6810f7c1606377b0491 (diff)
downloadmariadb-git-8b0ece5e88de965aeb2af410d193bf8c6d96dcde.tar.gz
new lock for multiupdate:
- open and create derived tables - detect which tables should be locked for write - lock and fill derived tables some unitialized variables fixed mysql-test/r/lock_multi.result: correct results returned mysql-test/r/multi_update.result: correct results returned mysql-test/r/view.result: correct results returned mysql-test/t/multi_update.test: correct results returned mysql-test/t/view.test: correct results returned sql/mysql_priv.h: derived tables processing splited on table creation and table filling sql/sql_base.cc: derived tables processing splited on table creation and table filling sql/sql_class.h: function to detect when we need fill derived tables sql/sql_derived.cc: derived tables processing splited on table creation and table filling sql/sql_lex.cc: fixed uninitialized value sql/sql_load.cc: fixed uninitialized value sql/sql_parse.cc: initialization muved (will be done for all queries) sql/sql_prepare.cc: preparation of multiupdate changed a bit because new locking procedure sql/sql_update.cc: new lock for multiupdate: - open and create derived tables - detect which tables should be locked for write - lock and fill derived tables sql/table.h: place to store select_result between creation and filling tables
Diffstat (limited to 'mysql-test/t/multi_update.test')
-rw-r--r--mysql-test/t/multi_update.test4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 8a213ab791c..1e1490cd3f1 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -159,8 +159,6 @@ LOCK TABLES t1 write, t2 read;
DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
--error 1099
UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
---QQ This should not generate an error
---error 1099
UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
unlock tables;
LOCK TABLES t1 write, t2 write;
@@ -428,7 +426,7 @@ drop table t1, t2, t3;
#
create table t1 (col1 int);
create table t2 (col1 int);
--- QQ The following should give error 1093
+-- error 1093
update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;
-- error 1093
delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;