bk commit into 5.1 tree (cmiller:1.2392)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2006-11-29 20:09:23-05:00, cmiller@stripped +2 -0
  Creating a procedure in the information_schema db is more than a
  permission problem.  Auguably, the error message should be better.

  mysql-test/r/information_schema.result@stripped, 2006-11-29 20:09:21-05:00, cmiller@stripped +1 -1
    Creating a procedure in the information_schema db is more than a
    permission problem.  Auguably, the error message should be better.

  mysql-test/t/information_schema.test@stripped, 2006-11-29 20:09:21-05:00, cmiller@stripped +1 -1
    Creating a procedure in the information_schema db is more than a
    permission problem.  Auguably, the error message should be better.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.137/mysql-test/r/information_schema.result	2006-11-29 20:09:28 -05:00
+++ 1.138/mysql-test/r/information_schema.result	2006-11-29 20:09:28 -05:00
@@ -1080,7 +1080,7 @@ CREATE PROCEDURE p1 ()
 BEGIN
 SELECT 'foo' FROM DUAL;
 END |
-ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ERROR 42000: Unknown database 'information_schema'
 select  ROUTINE_NAME from routines;
 ROUTINE_NAME
 grant all on information_schema.* to 'user1'@'localhost';

--- 1.87/mysql-test/t/information_schema.test	2006-11-29 20:09:28 -05:00
+++ 1.88/mysql-test/t/information_schema.test	2006-11-29 20:09:28 -05:00
@@ -721,7 +721,7 @@ create temporary table schemata(f1 char(
 # Bug #10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA
 #
 delimiter |;
---error 1044
+--error ER_BAD_DB_ERROR
 CREATE PROCEDURE p1 ()
 BEGIN
   SELECT 'foo' FROM DUAL;