Merge 5.0 -> 5.1

+ fix wrong resultfile have_outfile.require

1 files changed, 12 insertions, 11 deletions

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 0c3bd2f48aa..7c2023127f0 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -367,20 +367,20 @@ drop database TESTDB;
 flush privileges;
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
-grant all privileges on test.* to `a@`@localhost;
-grant execute on * to `a@`@localhost;
-create table t2 (s1 int);
-insert into t2 values (1);
-drop function if exists f2;
-create function f2 () returns int
-begin declare v int; select s1 from t2 into v; return v; end//
-select f2();
+GRANT ALL PRIVILEGES ON test.* TO `a@`@localhost;
+GRANT EXECUTE ON * TO `a@`@localhost;
+CREATE TABLE t2 (s1 INT);
+INSERT INTO t2 VALUES (1);
+DROP FUNCTION IF EXISTS f2;
+CREATE FUNCTION f2 () RETURNS INT
+BEGIN DECLARE v INT; SELECT s1 FROM t2 INTO v; RETURN v; END//
+SELECT f2();
 f2()
 1
-drop function f2;
-drop table t2;
+DROP FUNCTION f2;
+DROP TABLE t2;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM `a@`@localhost;
-drop user `a@`@localhost;
+DROP USER `a@`@localhost;
 SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
 drop database if exists mysqltest_1;
 drop database if exists mysqltest_2;
@@ -438,6 +438,7 @@ SELECT * FROM t2;
 ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2'
 SELECT * FROM t1 JOIN t2 USING (b);
 ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
+USE test;
 DROP TABLE db1.t1, db1.t2;
 DROP USER mysqltest1@localhost;
 DROP DATABASE db1;