diff options
| author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
| commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
| tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /mysql-test/t/multi_update.test | |
| parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
| parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
| download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz | |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 40e742679f8..e56636bd2ba 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -154,8 +154,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; -# The following should be fixed to not give 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; |