Fix for bug #490 and #491 (see details below)

mysql-test/r/insert_select.result:
  Result update.
mysql-test/r/rpl_insert_id.result:
  Test update
mysql-test/t/insert_select.test:
  Check if a partly completed INSERT SELECT (failing because of "Duplicate key"
  after successfully inserting other rows) is written to the binlog if the
  table is not transactional and at least one row has been inserted (bug #491)
mysql-test/t/rpl_insert_id.test:
  Test for bug #490 (INSERT SELECT in auto_increment)
sql/sql_insert.cc:
  - In INSERT ... SELECT, if it fails with error but one row has been inserted and
  the table is not transactional, we must write to the binlog (the slave will stop
  because of the error code in the binlog event, this is normal). bug 491.
  - we must set INSERT_ID before writing to the binlog (bug 490
  accidentally introduced by another dev in 4.0.13).

1 files changed, 28 insertions, 0 deletions

diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result
index d524818985e..6d996481a5c 100644
--- a/mysql-test/r/rpl_insert_id.result
+++ b/mysql-test/r/rpl_insert_id.result
@@ -39,3 +39,31 @@ b	c
 6	11
 drop table t1;
 drop table t2;
+create table t1(a int auto_increment, key(a));
+create table t2(b int auto_increment, c int, key(b));
+insert into t1 values (10);
+insert into t1 values (null),(null),(null);
+insert into t2 values (5,0);
+insert into t2 (c) select * from t1;
+select * from t2;
+b	c
+5	0
+6	10
+7	11
+8	12
+9	13
+select * from t1;
+a
+10
+11
+12
+13
+select * from t2;
+b	c
+5	0
+6	10
+7	11
+8	12
+9	13
+drop table t1;
+drop table t2;