Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  zim.(none):/home/brian/mysql/dep-5.1

mysql-test/extra/binlog_tests/insert_select-binlog.test

 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
 
+--disable_warnings
+drop table if exists t1,t2;
+--enable_warnings
+
 # Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
 # binlog
 

mysql-test/r/binlog_stm_insert_select.result

+drop table if exists t1,t2;
 create table t1(a int, unique(a));
 insert into t1 values(2);
 create table t2(a int);