From 3f0c44c605c6e6f9e3bbb92f7a43a598be5d5b1b Mon Sep 17 00:00:00 2001
From: unknown <holyfoot/hf@mysql.com/hfmain.(none)>
Date: Sat, 7 Apr 2007 23:16:03 +0500
Subject: 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''
---
 mysql-test/r/events_trans.result | 41 ----------------------------------------
 1 file changed, 41 deletions(-)

(limited to 'mysql-test/r/events_trans.result')

diff --git a/mysql-test/r/events_trans.result b/mysql-test/r/events_trans.result
index 145fb8be084..a9829db0c61 100644
--- a/mysql-test/r/events_trans.result
+++ b/mysql-test/r/events_trans.result
@@ -1,5 +1,4 @@
 drop database if exists events_test;
-drop database if exists mysqltest_db2;
 drop database if exists mysqltest_no_such_database;
 create database events_test;
 use events_test;
@@ -116,44 +115,4 @@ a
 OK: create event: database does not exist
 delete from t1;
 commit work;
-grant create, insert, select, delete on mysqltest_db2.*
-to mysqltest_user1@localhost;
-create database mysqltest_db2;
-set autocommit=off;
-select @@autocommit;
-@@autocommit
-0
-create table t1 (a varchar(255)) engine=innodb;
-begin work;
-insert into t1 (a) values ("OK: create event: insufficient privileges");
-create event e1 on schedule every 1 day do select 1;
-ERROR 42000: Access denied for user 'mysqltest_user1'@'localhost' to database 'mysqltest_db2'
-rollback work;
-select * from t1;
-a
-OK: create event: insufficient privileges
-delete from t1;
-commit work;
-begin work;
-insert into t1 (a) values ("OK: alter event: insufficient privileges");
-alter event e1 on schedule every 1 day do select 1;
-ERROR 42000: Access denied for user 'mysqltest_user1'@'localhost' to database 'mysqltest_db2'
-rollback work;
-select * from t1;
-a
-OK: alter event: insufficient privileges
-delete from t1;
-commit work;
-begin work;
-insert into t1 (a) values ("OK: drop event: insufficient privileges");
-drop event e1;
-ERROR 42000: Access denied for user 'mysqltest_user1'@'localhost' to database 'mysqltest_db2'
-rollback work;
-select * from t1;
-a
-OK: drop event: insufficient privileges
-delete from t1;
-commit work;
-drop user mysqltest_user1@localhost;
-drop database mysqltest_db2;
 drop database events_test;
-- 
cgit v1.2.1