summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <cbell/Chuck@mysql_cab_desk.>2007-03-29 16:54:16 -0400
committerunknown <cbell/Chuck@mysql_cab_desk.>2007-03-29 16:54:16 -0400
commit39176e9f2d5536045860b0d125331007de6c51df (patch)
treee15086fdf8cc365bdc824bd87d6be65c924a5300 /mysql-test/include
parent85f7c6776b0f2da322bacf07b878db3fdd453d83 (diff)
parentd3ef3c9f2fd4eb0dd907755174dba1bb5b4fac95 (diff)
downloadmariadb-git-39176e9f2d5536045860b0d125331007de6c51df.tar.gz
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/rpl_udf.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/rpl_udf.inc b/mysql-test/include/rpl_udf.inc
index ef20327078e..424bacc4216 100644
--- a/mysql-test/include/rpl_udf.inc
+++ b/mysql-test/include/rpl_udf.inc
@@ -34,6 +34,7 @@ eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";
--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
--error ER_CANT_FIND_DL_ENTRY
eval CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";
+--replace_column 3 UDF_LIB
SELECT * FROM mysql.func;
--disable_info
@@ -105,7 +106,7 @@ DROP TABLE t1;
--echo "Running on the master"
--enable_info
CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
-CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 0.95;
+CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
--disable_info