Merge embedded server testing changes from 4.1.

mysql-test/r/innodb.result:
  Auto merged
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
  Auto merged
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
  Auto merged
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merge
mysql-test/r/alter_table.result:
  Update results
mysql-test/r/ctype_ucs.result:
  Update results
mysql-test/r/grant.result:
  Update results
mysql-test/r/insert_select.result:
  Update results
mysql-test/r/ps_1general.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/r/timezone2.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/r/user_var.result:
  Update results
mysql-test/t/ctype_ucs.test:
  Merge
mysql-test/t/grant.test:
  Merge
mysql-test/t/insert_select.test:
  Merge
mysql-test/t/timezone2.test:
  Merge
mysql-test/t/type_ranges.test:
  Merge
mysql-test/t/user_var.test:
  Merge

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
 #