Merge embedded server testing changes from 4.1.

1 files changed, 0 insertions, 33 deletions

diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test
index 371df339b57..40dc4e20093 100644
--- a/mysql-test/t/insert_select.test
+++ b/mysql-test/t/insert_select.test
@@ -71,39 +71,6 @@ WHERE numeropost=9 ORDER BY numreponse ASC;
 
 DROP TABLE t1,t2;
 
-# Check if a partly-completed INSERT SELECT in a MyISAM table goes
-# into the binlog
-
-create table t1(a int, unique(a));
-insert into t1 values(2);
-create table t2(a int);
-insert into t2 values(1),(2);
-reset master;
---error 1062
-insert into t1 select * from t2;
-# The above should produce an error, but still be in the binlog;
-# verify the binlog :
-let $VERSION=`select version()`;
---replace_result $VERSION VERSION
---replace_column 2 # 5 #
-show binlog events;
-select * from t1;
-drop table t1, t2;
-
-# Verify that a partly-completed CREATE TABLE .. SELECT does not
-# get into the binlog (Bug #6682)
-create table t1(a int);
-insert into t1 values(1),(1);
-reset master;
---error 1062
-create table t2(unique(a)) select a from t1;
-# The above should produce an error, *and* not appear in the binlog
-let $VERSION=`select version()`;
---replace_result $VERSION VERSION
---replace_column 2 # 5 #
-show binlog events;
-drop table t1;
-
 #
 # Test of insert ... select from same table
 #