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

1 files changed, 11 insertions, 0 deletions

diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index c6b7a40214d..48cfa47b75c 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -130,3 +130,14 @@ select * from t1;
 a	b
 7	7
 drop table t1;
+create table t1 (a int not null auto_increment primary key, b char(32));
+insert into t1 (b) values ('apple'), ('apple');
+select * from t1;
+a	b
+1	apple
+2	apple
+delete t1 from t1, t1 as t2 where t1.b = t2.b and t1.a > t2.a;
+select * from t1;
+a	b
+1	apple
+drop table t1;