Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491


mysql-test/t/sp-error.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
mysql-test/r/sp-error.result:
  SCCS merged
mysql-test/t/disabled.def:
  SCCS merged
mysql-test/t/ps.test:
  SCCS merged

1 files changed, 16 insertions, 0 deletions

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index d82b07fa7d3..a99fdb16868 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1544,6 +1544,22 @@ a
 2
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1,t2;
+drop tables if exists t1;
+create table t1 (id int primary key auto_increment, value varchar(10));
+insert into t1 (id, value) values (1, 'FIRST'), (2, 'SECOND'), (3, 'THIRD');
+prepare stmt from "insert into t1 (id, value) select * from (select 4 as i, 'FOURTH' as v) as y on duplicate key update v = 'DUP'";
+execute stmt;
+ERROR 42S22: Unknown column 'v' in 'field list'
+execute stmt;
+ERROR 42S22: Unknown column 'v' in 'field list'
+deallocate prepare stmt;
+prepare stmt from "insert into t1 (id, value) select * from (select 4 as id, 'FOURTH' as value) as y on duplicate key update y.value = 'DUP'";
+execute stmt;
+ERROR 42S22: Unknown column 'y.value' in 'field list'
+execute stmt;
+ERROR 42S22: Unknown column 'y.value' in 'field list'
+deallocate prepare stmt;
+drop tables t1;
 End of 5.0 tests.
 create procedure proc_1() reset query cache;
 call proc_1();