bk commit into 5.1 tree (msvensson:1.2351)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-12-05 12:18:33+01:00, msvensson@neptunus.(none) +2 -0
  Update rsult file after merge, error message number increased

  mysql-test/r/sp.result@stripped, 2006-12-05 12:18:31+01:00, msvensson@neptunus.(none) +4 -4
    Update rsult file after merge, error message number increased

  mysql-test/r/sp_gis.result@stripped, 2006-12-05 12:18:31+01:00, msvensson@neptunus.(none) +2 -2
    Update rsult file after merge, error message number increased

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.2/mysql-test/r/sp_gis.result	2006-12-05 12:18:40 +01:00
+++ 1.3/mysql-test/r/sp_gis.result	2006-12-05 12:18:40 +01:00
@@ -7,11 +7,11 @@ return 1;
 create function x() returns int
 return 2;
 Warnings:
-Note	1578	This function 'x' has the same name as a native function.
+Note	1579	This function 'x' has the same name as a native function.
 create function y() returns int
 return 3;
 Warnings:
-Note	1578	This function 'y' has the same name as a native function.
+Note	1579	This function 'y' has the same name as a native function.
 select a();
 a()
 1

--- 1.237/mysql-test/r/sp.result	2006-12-05 12:18:40 +01:00
+++ 1.238/mysql-test/r/sp.result	2006-12-05 12:18:40 +01:00
@@ -5633,7 +5633,7 @@ drop function if exists pi;
 create function pi() returns varchar(50)
 return "pie, my favorite desert.";
 Warnings:
-Note	1578	This function 'pi' has the same name as a native function.
+Note	1579	This function 'pi' has the same name as a native function.
 SET @save_sql_mode=@@sql_mode;
 SET SQL_MODE='IGNORE_SPACE';
 select pi(), pi ();
@@ -5682,15 +5682,15 @@ use test;
 create function `database`() returns varchar(50)
 return "Stored function database";
 Warnings:
-Note	1578	This function 'database' has the same name as a native function.
+Note	1579	This function 'database' has the same name as a native function.
 create function `current_user`() returns varchar(50)
 return "Stored function current_user";
 Warnings:
-Note	1578	This function 'current_user' has the same name as a native function.
+Note	1579	This function 'current_user' has the same name as a native function.
 create function md5(x varchar(50)) returns varchar(50)
 return "Stored function md5";
 Warnings:
-Note	1578	This function 'md5' has the same name as a native function.
+Note	1579	This function 'md5' has the same name as a native function.
 SET SQL_MODE='IGNORE_SPACE';
 select database(), database ();
 database()	database ()