Made the test deterministic, so they don't depend on the SF cache.

mysql-test/r/sp.result

@@ -5642,8 +5642,6 @@ pi()	pi ()
 select test.pi(), test.pi ();
 test.pi()	test.pi ()
 pie, my favorite desert.	pie, my favorite desert.
-Warnings:
-Note	1578	This function 'pi' has the same name as a native function.
 SET SQL_MODE='';
 select pi(), pi ();
 pi()	pi ()
@@ -5706,18 +5704,12 @@ md5("aaa")	md5 ("aaa")
 select test.database(), test.database ();
 test.database()	test.database ()
 Stored function database	Stored function database
-Warnings:
-Note	1578	This function 'database' has the same name as a native function.
 select test.current_user(), test.current_user ();
 test.current_user()	test.current_user ()
 Stored function current_user	Stored function current_user
-Warnings:
-Note	1578	This function 'current_user' has the same name as a native function.
 select test.md5("aaa"), test.md5 ("aaa");
 test.md5("aaa")	test.md5 ("aaa")
 Stored function md5	Stored function md5
-Warnings:
-Note	1578	This function 'md5' has the same name as a native function.
 SET SQL_MODE='';
 select database(), database ();
 database()	database ()

mysql-test/r/sp_gis.result

@@ -25,9 +25,6 @@ x(PointFromText("POINT(10 20)"))	y(PointFromText("POINT(10 20)"))
 select test.a(), test.x(), test.y();
 test.a()	test.x()	test.y()
 1	2	3
-Warnings:
-Note	1578	This function 'x' has the same name as a native function.
-Note	1578	This function 'y' has the same name as a native function.
 drop function a;
 drop function x;
 drop function y;

mysql-test/t/sp.test

@@ -6609,12 +6609,20 @@ SET @save_sql_mode=@@sql_mode;
 SET SQL_MODE='IGNORE_SPACE';
 
 select pi(), pi ();
+
+# Non deterministic warnings from db_load_routine
+--disable_warnings
 select test.pi(), test.pi ();
+--enable_warnings
 
 SET SQL_MODE='';
 
 select pi(), pi ();
+
+# Non deterministic warnings from db_load_routine
+--disable_warnings
 select test.pi(), test.pi ();
+--enable_warnings
 
 SET @@sql_mode=@save_sql_mode;
 
@@ -6666,9 +6674,12 @@ select database(), database ();
 select current_user(), current_user ();
 select md5("aaa"), md5 ("aaa");
 
+# Non deterministic warnings from db_load_routine
+--disable_warnings
 select test.database(), test.database ();
 select test.current_user(), test.current_user ();
 select test.md5("aaa"), test.md5 ("aaa");
+--enable_warnings
 
 SET SQL_MODE='';
 
@@ -6676,9 +6687,12 @@ select database(), database ();
 select current_user(), current_user ();
 select md5("aaa"), md5 ("aaa");
 
+# Non deterministic warnings from db_load_routine
+--disable_warnings
 select test.database(), test.database ();
 select test.current_user(), test.current_user ();
 select test.md5("aaa"), test.md5 ("aaa");
+--enable_warnings
 
 SET @@sql_mode=@save_sql_mode;
 

mysql-test/t/sp_gis.test

@@ -27,7 +27,11 @@ select x();
 --error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
 select y();
 select x(PointFromText("POINT(10 20)")), y(PointFromText("POINT(10 20)"));
+
+# Non deterministic warnings from db_load_routine
+--disable_warnings
 select test.a(), test.x(), test.y();
+--enable_warnings
 
 drop function a;
 drop function x;