Fixing test failures caused by the previous commits.

Adding "--source include/have_udf.inc" and a few "--replace" commands.

3 files changed, 10 insertions, 1 deletions

diff --git a/mysql-test/t/create_drop_binlog.test b/mysql-test/t/create_drop_binlog.test
index 357cf8893fc..655a54308d6 100644
--- a/mysql-test/t/create_drop_binlog.test
+++ b/mysql-test/t/create_drop_binlog.test
@@ -1,3 +1,4 @@
+--source include/have_udf.inc
 --source include/have_log_bin.inc
 
 --let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
diff --git a/mysql-test/t/create_drop_udf.test b/mysql-test/t/create_drop_udf.test
index cc1b0a2c51e..5908bf04e90 100644
--- a/mysql-test/t/create_drop_udf.test
+++ b/mysql-test/t/create_drop_udf.test
@@ -1,12 +1,16 @@
+--source include/have_udf.inc
+
 --replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 eval CREATE FUNCTION IF NOT EXISTS metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
 
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 --error ER_UDF_EXISTS
 CREATE FUNCTION metaphon RETURNS INT SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
 
 --replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 eval CREATE FUNCTION IF NOT EXISTS metaphon RETURNS REAL SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
 
@@ -15,6 +19,7 @@ DROP FUNCTION IF EXISTS metaphon;
 eval CREATE FUNCTION IF NOT EXISTS metaphon RETURNS REAL SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
 
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 --error ER_WRONG_USAGE
 eval CREATE OR REPLACE FUNCTION IF NOT EXISTS metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
@@ -23,6 +28,7 @@ SELECT ret FROM mysql.func WHERE name like 'metaphon';
 eval CREATE OR REPLACE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_SO";
 SELECT ret FROM mysql.func WHERE name like 'metaphon';
 
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 --error ER_UDF_EXISTS
 eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_SO";
 SELECT metaphon('mariadb');
diff --git a/mysql-test/t/create_or_replace_permission.test b/mysql-test/t/create_or_replace_permission.test
index 32a721e9d68..22ba40f43f9 100644
--- a/mysql-test/t/create_or_replace_permission.test
+++ b/mysql-test/t/create_or_replace_permission.test
@@ -1,3 +1,4 @@
+--source include/have_udf.inc
 # Grant tests not performed with embedded server
 -- source include/not_embedded.inc
 
@@ -44,8 +45,9 @@ CREATE OR REPLACE TABLE t1(id INT);
 --error ER_PROCACCESS_DENIED_ERROR
 CREATE OR REPLACE PROCEDURE proc1 (OUT cnt INT) BEGIN END;
 
+--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB
 --error ER_DBACCESS_DENIED_ERROR
-CREATE OR REPLACE FUNCTION lookup RETURNS STRING SONAME "udf_example.so";
+eval CREATE OR REPLACE FUNCTION lookup RETURNS STRING SONAME "$UDF_EXAMPLE_SO";
 
 --error ER_PROCACCESS_DENIED_ERROR
 CREATE OR REPLACE FUNCTION hello(str char(20)) RETURNS TEXT RETURN CONCAT('Hello, ', str, '!');