From 40762f91b5218b238f0b19316db7939e2194e5b0 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 5 Dec 2006 12:18:33 +0100
Subject: [PATCH] Update rsult file after merge, error message number increased

---
 mysql-test/r/sp.result     | 8 ++++----
 mysql-test/r/sp_gis.result | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 7ec930cc087..6859de2ed63 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -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 ()
diff --git a/mysql-test/r/sp_gis.result b/mysql-test/r/sp_gis.result
index ea2cdd0d29d..0eebd1b9342 100644
--- a/mysql-test/r/sp_gis.result
+++ b/mysql-test/r/sp_gis.result
@@ -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