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

2 files changed, 18 insertions, 0 deletions

diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 316f4842aac..8f4763c636a 100644
--- a/mysql-test/t/sp.test
+++ b/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;
 
diff --git a/mysql-test/t/sp_gis.test b/mysql-test/t/sp_gis.test
index f1d489e4cc5..51ed78b27d5 100644
--- a/mysql-test/t/sp_gis.test
+++ b/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;