Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt

into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt


mysql-test/r/odbc.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  merge the test at the end of 4.1 test
mysql-test/t/rpl_insert_id.test:
  merge the test at the end of 4.1 test
sql/sql_class.cc:
  merged
sql/sql_class.h:
  merged

1 files changed, 13 insertions, 0 deletions

diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result
index b11f1b92020..21eade8f9cf 100644
--- a/mysql-test/r/rpl_insert_id.result
+++ b/mysql-test/r/rpl_insert_id.result
@@ -73,7 +73,20 @@ CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
+drop table if exists t1, t2;
+create table t1(a int auto_increment, key(a));
+create table t2(a int);
+insert into t1 (a) values (null);
+insert into t2 (a) select a from t1 where a is null;
+insert into t2 (a) select a from t1 where a is null;
+select * from t2;
+a
+1
+select * from t2;
+a
+1
 drop table t1;
+drop table t2;
 drop function if exists bug15728;
 drop function if exists bug15728_insert;
 drop table if exists t1, t2;