Merge 5.3 -> 5.5

pending merges:
  Sergey Petrunya 2013-11-27 MDEV-5344: LEFT OUTER JOIN table data is lost...

1 files changed, 31 insertions, 0 deletions

diff --git a/mysql-test/t/table_elim.test b/mysql-test/t/table_elim.test
index 357953290c4..0d42dca57b7 100644
--- a/mysql-test/t/table_elim.test
+++ b/mysql-test/t/table_elim.test
@@ -544,6 +544,37 @@ drop view v1;
 DROP TABLE t1,t2,t3;
 
 --echo #
+--echo # MDEV-5344: LEFT OUTER JOIN table data is lost in ON DUPLICATE KEY UPDATE section
+--echo #
+create table t1 (
+	id int(10) unsigned NOT NULL DEFAULT '0',
+	v int(10) unsigned DEFAULT '0',
+	PRIMARY KEY (id)
+);
+
+create table t2 (
+	id int(10) unsigned NOT NULL DEFAULT '0',
+	PRIMARY KEY (id)
+) ;
+
+create table t3 (
+	id int(10) unsigned NOT NULL DEFAULT '0',
+	v int(10) unsigned DEFAULT '0',
+	PRIMARY KEY (id)
+);
+
+insert into t1 values (1, 10), (2, 10);
+insert into t2 values (1), (2);
+insert into t3 values (1, 20);
+
+insert into t1 
+select t2.id, 5 from t2 LEFT OUTER JOIN t3 ON t2.id = t3.id
+on duplicate key update t1.v = t3.v;
+
+select * from t1;
+drop table t1,t2,t3;
+
+--echo #
 --echo # BUG#919878: Assertion `!eliminated_tables...
 --echo #
 CREATE TABLE t1 ( a INT );