after-merging fix

mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''

1 files changed, 0 insertions, 44 deletions

diff --git a/mysql-test/t/events_trans.test b/mysql-test/t/events_trans.test
index 41044f9975f..77427070cbb 100644
--- a/mysql-test/t/events_trans.test
+++ b/mysql-test/t/events_trans.test
@@ -4,7 +4,6 @@
 -- source include/have_innodb.inc
 --disable_warnings
 drop database if exists events_test;
-drop database if exists mysqltest_db2;
 drop database if exists mysqltest_no_such_database;
 --enable_warnings
 create database events_test;
@@ -108,49 +107,6 @@ rollback work;
 select * from t1;
 delete from t1;
 commit work;
-#
-# Privilege checks
-#
-grant create, insert, select, delete on mysqltest_db2.*
-  to mysqltest_user1@localhost;
-create database mysqltest_db2;
-connect (conn1,localhost,mysqltest_user1,,mysqltest_db2);
-set autocommit=off;
-# Sanity check
-select @@autocommit;
-create table t1 (a varchar(255)) engine=innodb;
-# Not enough privileges to CREATE EVENT
-begin work;
-insert into t1 (a) values ("OK: create event: insufficient privileges");
---error ER_DBACCESS_DENIED_ERROR
-create event e1 on schedule every 1 day do select 1;
-rollback work;
-select * from t1;
-delete from t1;
-commit work;
-# Not enough privileges to ALTER EVENT
-begin work;
-insert into t1 (a) values ("OK: alter event: insufficient privileges");
---error ER_DBACCESS_DENIED_ERROR
-alter event e1 on schedule every 1 day do select 1;
-rollback work;
-select * from t1;
-delete from t1;
-commit work;
-# Not enough privileges to DROP EVENT
-begin work;
-insert into t1 (a) values ("OK: drop event: insufficient privileges");
---error ER_DBACCESS_DENIED_ERROR
-drop event e1;
-rollback work;
-select * from t1;
-delete from t1;
-commit work;
-# Cleanup
-disconnect conn1;
-connection default;
-drop user mysqltest_user1@localhost;
-drop database mysqltest_db2;
 
 #
 # Cleanup