Commit 1a0bd37c authored by unknown's avatar unknown
Browse files

errmsg change

parent efa5ba55

mysql-test/r/sp.result

+4 −4
Original line number Diff line number Diff line
@@ -5633,7 +5633,7 @@ drop function if exists pi; 
create function pi() returns varchar(50)

return "pie, my favorite desert.";

Warnings:

Note	1581	This function 'pi' has the same name as a native function.

Note	1581	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	1581	This function 'database' has the same name as a native function.

Note	1581	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	1581	This function 'current_user' has the same name as a native function.

Note	1581	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	1581	This function 'md5' has the same name as a native function.

Note	1581	This function 'md5' has the same name as a native function

SET SQL_MODE='IGNORE_SPACE';

select database(), database ();

database()	database ()

mysql-test/r/sp_gis.result

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ return 1; 
create function x() returns int

return 2;

Warnings:

Note	1581	This function 'x' has the same name as a native function.

Note	1581	This function 'x' has the same name as a native function

create function y() returns int

return 3;

Warnings:

Note	1581	This function 'y' has the same name as a native function.

Note	1581	This function 'y' has the same name as a native function

select a();

a()

1

mysql-test/r/udf.result

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ select abs(myfunc_double(3) AS wrong); 
ERROR 42000: Incorrect parameters in the call to native function 'abs'

drop function if exists pi;

CREATE FUNCTION pi RETURNS STRING SONAME "should_not_parse.so";

ERROR HY000: This function 'pi' has the same name as a native function.

ERROR HY000: This function 'pi' has the same name as a native function

DROP FUNCTION IF EXISTS metaphon;

CREATE FUNCTION metaphon(a int) RETURNS int

return 0;