From 8eb22d157d5dd3a09145bb643384cfa09eaf7068 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 May 2007 06:29:34 +0200 Subject: Fix braindead bad merge of mysqldump test. mysql-test/r/mysqldump.result: Fix braindead bad merge mysql-test/t/mysqldump.test: Fix braindead bad merge --- mysql-test/r/mysqldump.result | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'mysql-test/r/mysqldump.result') diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index db1eecea6be..af0db95d97c 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3297,33 +3297,6 @@ DELIMITER ;; -- insufficient privileges to SHOW CREATE PROCEDURE `sp1` -- does user2 have permissions on mysql.proc? -DELIMITER ; -DELIMITER ;; -/*!50003 SET SESSION SQL_MODE=""*/;; -/*!50003 CREATE*/ /*!50020 DEFINER=`user1`@`%`*/ /*!50003 PROCEDURE `sp1`() -select 'hello' */;; -/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE*/;; -DELIMITER ; -drop procedure sp1; -drop user user1; -drop user user2; -drop database mysqldump_test_db; -# -# Bug 27293: mysqldump crashes when dumping routines -# defined by a different user -# -# Bug #22761: mysqldump reports no errors when using -# --routines without mysql.proc privileges -# -create database mysqldump_test_db; -grant all privileges on mysqldump_test_db.* to user1; -grant all privileges on mysqldump_test_db.* to user2; -create procedure mysqldump_test_db.sp1() select 'hello'; -DELIMITER ;; - --- insufficient privileges to SHOW CREATE PROCEDURE `sp1` --- does user2 have permissions on mysql.proc? - DELIMITER ; DELIMITER ;; /*!50003 SET SESSION SQL_MODE=""*/;; -- cgit v1.2.1