bk commit into 5.1 tree (tsmith:1.2496)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-01 06:29:34+02:00, tsmith@stripped +2 -0
  Fix braindead bad merge of mysqldump test.

  mysql-test/r/mysqldump.result@stripped, 2007-05-01 06:29:03+02:00, tsmith@stripped +0 -27
    Fix braindead bad merge

  mysql-test/t/mysqldump.test@stripped, 2007-05-01 06:29:03+02:00, tsmith@stripped +0 -33
    Fix braindead bad merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

--- 1.147/mysql-test/r/mysqldump.result	2007-04-30 23:30:17 +02:00
+++ 1.148/mysql-test/r/mysqldump.result	2007-05-01 06:29:03 +02:00
@@ -3308,33 +3308,6 @@ 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=""*/;;
-/*!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;
 #
 # End of 5.0 tests
 #

--- 1.138/mysql-test/t/mysqldump.test	2007-04-30 23:32:06 +02:00
+++ 1.139/mysql-test/t/mysqldump.test	2007-05-01 06:29:03 +02:00
@@ -1530,39 +1530,6 @@ drop database mysqldump_test_db;
 
 
 
---echo # 
---echo # Bug 27293: mysqldump crashes when dumping routines
---echo # defined by a different user
---echo #
---echo # Bug #22761: mysqldump reports no errors when using
---echo # --routines without mysql.proc privileges
---echo #
-
-create database mysqldump_test_db;
-
-grant all privileges on mysqldump_test_db.*  to user1;
-grant all privileges on mysqldump_test_db.*  to user2;
-
-connect (user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYSOCK);
-connection user27293;
-
-create procedure mysqldump_test_db.sp1() select 'hello';
-
---error 2
---exec $MYSQL_DUMP -f --compact --user=user2 --password=  -h 127.0.0.1 -P $MASTER_MYPORT --routines mysqldump_test_db
-
---exec $MYSQL_DUMP -f --compact --user=user1 --password=  -h 127.0.0.1 -P $MASTER_MYPORT --routines mysqldump_test_db
-
-drop procedure sp1;
-
-connection default;
-drop user user1;
-drop user user2;
-
-drop database mysqldump_test_db;
-
-
-
 --echo #
 --echo # End of 5.0 tests
 --echo #