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

Apply malff@weblab.(none) fix for bug 24736 directly to 

mysql-5.1-build tree, in order to get it into mysql-5.1
faster.  See comments from Marc's original push for
patch details.
parent bfee156a

mysql-test/r/parser.result

+101 −0
Original line number Diff line number Diff line
@@ -373,3 +373,104 @@ select yearweek(); 
ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'

select yearweek(1, 2, 3);

ERROR 42000: Incorrect parameter count in the call to native function 'yearweek'

select abs(3);

abs(3)

3

select abs(3 AS three);

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 three);

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 AS "three");

ERROR 42000: Incorrect parameters in the call to native function 'abs'

select abs(3 "three");

ERROR 42000: Incorrect parameters in the call to native function 'abs'

set @bar="bar";

set @foobar="foobar";

select instr("foobar", "bar");

instr("foobar", "bar")

4

select instr("foobar" AS p1, "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" p1, "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" AS "p1", "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" "p1", "bar");

instr("foobar" "p1", "bar")

4

select instr(@foobar "p1", "bar");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" AS "p2");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar", "bar" "p2");

instr("foobar", "bar" "p2")

0

select instr("foobar", @bar "p2");

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select instr("foobar" AS p1, "bar" AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'instr'

select conv(255, 10, 16);

conv(255, 10, 16)

FF

select conv(255 AS p1, 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 p1, 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 AS "p1", 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 "p1", 10, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 AS p2, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 p2, 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 AS "p2", 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10 "p2", 16);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 AS p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 AS "p3");

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255, 10, 16 "p3");

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select conv(255 AS p1, 10 AS p2, 16 AS p3);

ERROR 42000: Incorrect parameters in the call to native function 'conv'

select atan(10);

atan(10)

1.4711276743037

select atan(10 AS p1);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 p1);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS "p1");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 "p1");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20);

atan(10, 20)

0.46364760900081

select atan(10 AS p1, 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 p1, 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS "p1", 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 "p1", 20);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 AS "p2");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10, 20 "p2");

ERROR 42000: Incorrect parameters in the call to native function 'atan'

select atan(10 AS p1, 20 AS p2);

ERROR 42000: Incorrect parameters in the call to native function 'atan'

mysql-test/r/udf.result

+24 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ a c 
1	1

2	2

SELECT a, fn(MIN(b) xx) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx) as c FROM t1 GROUP BY a' at line 1

ERROR 42000: Incorrect parameters in the call to stored function 'fn'

SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1

ERROR 42000: Incorrect parameters in the call to stored function 'fn'

SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1

SELECT myfunc_int(fn(MIN(b)) xx) as c FROM t1 GROUP BY a;
@@ -185,6 +185,28 @@ DROP VIEW v1; 
DROP TABLE t1;

DROP FUNCTION fn;

End of 5.0 tests.

select myfunc_double(3);

myfunc_double(3)

51.00

select myfunc_double(3 AS three);

myfunc_double(3 AS three)

51.00

select myfunc_double(abs(3));

myfunc_double(abs(3))

51.00

select myfunc_double(abs(3) AS named_param);

myfunc_double(abs(3) AS named_param)

51.00

select abs(myfunc_double(3));

abs(myfunc_double(3))

51.00

select abs(myfunc_double(3 AS three));

abs(myfunc_double(3 AS three))

51.00

select myfunc_double(abs(3 AS wrong));

ERROR 42000: Incorrect parameters in the call to native function 'abs'

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.

mysql-test/t/parser.test

+110 −0
Original line number Diff line number Diff line
@@ -493,3 +493,113 @@ select yearweek(); 
-- error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT

select yearweek(1, 2, 3);



#

# Bug#24736: UDF functions parsed as Stored Functions

#



# Verify that the syntax for calling UDF : foo(expr AS param, ...)

# can not be used when calling native functions



# Native function with 1 argument



select abs(3);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select abs(3 AS three);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select abs(3 three);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select abs(3 AS "three");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select abs(3 "three");



# Native function with 2 arguments



set @bar="bar";

set @foobar="foobar";



select instr("foobar", "bar");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar" AS p1, "bar");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar" p1, "bar");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar" AS "p1", "bar");

## String concatenation, valid syntax

select instr("foobar" "p1", "bar");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr(@foobar "p1", "bar");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar", "bar" AS p2);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar", "bar" p2);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar", "bar" AS "p2");

## String concatenation, valid syntax

select instr("foobar", "bar" "p2");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar", @bar "p2");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select instr("foobar" AS p1, "bar" AS p2);



# Native function with 3 arguments



select conv(255, 10, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255 AS p1, 10, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255 p1, 10, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255 AS "p1", 10, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255 "p1", 10, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10 AS p2, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10 p2, 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10 AS "p2", 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10 "p2", 16);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10, 16 AS p3);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10, 16 p3);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10, 16 AS "p3");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255, 10, 16 "p3");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select conv(255 AS p1, 10 AS p2, 16 AS p3);



# Native function with a variable number of arguments



select atan(10);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 AS p1);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 p1);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 AS "p1");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 "p1");



select atan(10, 20);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 AS p1, 20);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 p1, 20);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 AS "p1", 20);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 "p1", 20);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10, 20 AS p2);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10, 20 p2);

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10, 20 AS "p2");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10, 20 "p2");

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select atan(10 AS p1, 20 AS p2);

mysql-test/t/udf.test

+18 −2
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ EXPLAIN EXTENDED SELECT myfunc_int(a AS attr_name) FROM t1; 
EXPLAIN EXTENDED SELECT myfunc_int(a) FROM t1;

SELECT a,c FROM v1;



--error ER_PARSE_ERROR

--error ER_WRONG_PARAMETERS_TO_STORED_FCT

SELECT a, fn(MIN(b) xx) as c FROM t1 GROUP BY a;

--error ER_PARSE_ERROR

--error ER_WRONG_PARAMETERS_TO_STORED_FCT

SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

--error ER_PARSE_ERROR

SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a;
@@ -173,6 +173,22 @@ DROP FUNCTION fn; 


--echo End of 5.0 tests.



#

# Bug#24736: UDF functions parsed as Stored Functions

#



select myfunc_double(3);

select myfunc_double(3 AS three);

select myfunc_double(abs(3));

select myfunc_double(abs(3) AS named_param);

select abs(myfunc_double(3));

select abs(myfunc_double(3 AS three));



-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select myfunc_double(abs(3 AS wrong));

-- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT

select abs(myfunc_double(3) AS wrong);



#

# BUG#18239: Possible to overload internal functions with stored functions

#

sql/item_create.cc

+200 −78

File changed.

Preview size limit exceeded, changes collapsed.