Merge

sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/r/multi_update.result:
  SCCS merged
mysql-test/t/multi_update.test:
  SCCS merged

1 files changed, 10 insertions, 0 deletions

diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 61a284a7aec..56dcf9a03a9 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -268,6 +268,16 @@ update t1 left join t2  on t1.a=t2.a set t1.b=2, t2.b=2 where t1.b=1 and t2.b=1
 select t1.a, t1.b,t2.a, t2.b from t1 left join t2  on t1.a=t2.a where t1.b=1 and t2.b=1 or t2.a is NULL;
 drop table t1,t2;
 
+#
+# Test reuse of same table
+#
+
+create table t1 (a int not null auto_increment primary key, b int not null);
+insert into t1 (b) values (1),(2),(3),(4);
+update t1, t1 as t2 set t1.b=t2.b+1 where t1.a=t2.a;
+select * from t1;
+drop table t1;
+
 # Test multi-update and multi-delete with impossible where
 
 drop table if exists t1, t2;