bug fixes and tests ...

mysql-test/r/update.result:
  Test for update with subselect and derived table ...
mysql-test/t/update.test:
  Test for update with subselect and derived table ...
sql/sql_union.cc:
  Fix for usage of ORDER BY ... and / or LIMIT .... without braces

1 files changed, 4 insertions, 1 deletions

diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index 5cbbd2a350e..24620982cda 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -85,5 +85,8 @@ create table t1 (a int not null, b int not null);
 insert into t1 values (1,1),(1,2),(1,3);
 update t1 set b=4 where a=1 order by b asc limit 1;
 update t1 set b=4 where a=1 order by b desc limit 1;
+create table t2 (a int not null, b int not null);
+insert into t2 values (1,1),(1,2),(1,3);
 select * from t1;
-drop table t1;
+update t1 set b=(select distinct 1 from (select * from t2) a);
+drop table t1,t2;