Commit f8d26221 authored by malff@lambda.hsd1.co.comcast.net.'s avatar malff@lambda.hsd1.co.comcast.net.
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-28318-rework
parents f721a6f6 a9c6ed46

mysql-test/r/sp-error.result

+2 −2
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ ERROR 42S02: Unknown table 'c' in field list 
drop procedure bug15091;

drop function if exists bug16896;

create aggregate function bug16896() returns int return 1;

ERROR 42000: AGGREGATE is not supported for stored functions

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 '() returns int return 1' at line 1

DROP PROCEDURE IF EXISTS bug14702;

CREATE IF NOT EXISTS PROCEDURE bug14702()

BEGIN
@@ -1457,7 +1457,7 @@ CREATE DATABASE mysqltest; 
USE mysqltest;

DROP DATABASE mysqltest;

SELECT inexistent(), 1 + ,;

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 '' at line 1

ERROR 42000: FUNCTION inexistent does not exist

SELECT inexistent();

ERROR 42000: FUNCTION inexistent does not exist

SELECT .inexistent();

mysql-test/r/sp.result

+15 −0
Original line number Diff line number Diff line
@@ -6563,6 +6563,21 @@ f1() 
DROP TABLE t1;

DROP FUNCTION f1;



DROP PROCEDURE IF EXISTS db28318_a.t1;

DROP PROCEDURE IF EXISTS db28318_b.t2;

DROP DATABASE IF EXISTS db28318_a;

DROP DATABASE IF EXISTS db28318_b;

CREATE DATABASE db28318_a;

CREATE DATABASE db28318_b;

CREATE PROCEDURE db28318_a.t1() SELECT "db28318_a.t1";

CREATE PROCEDURE db28318_b.t2() CALL t1();

use db28318_a;

CALL db28318_b.t2();

ERROR 42000: PROCEDURE db28318_b.t1 does not exist

DROP PROCEDURE db28318_a.t1;

DROP PROCEDURE db28318_b.t2;

DROP DATABASE db28318_a;

DROP DATABASE db28318_b;

# ------------------------------------------------------------------

# -- End of 5.0 tests

# ------------------------------------------------------------------

mysql-test/r/udf.result

+2 −2
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ FR 
DROP TABLE bug19904;

CREATE DEFINER=CURRENT_USER() FUNCTION should_not_parse

RETURNS STRING SONAME "should_not_parse.so";

ERROR HY000: Incorrect usage of SONAME and DEFINER

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 'RETURNS STRING SONAME "should_not_parse.so"' at line 2

CREATE DEFINER=someone@somewhere FUNCTION should_not_parse

RETURNS STRING SONAME "should_not_parse.so";

ERROR HY000: Incorrect usage of SONAME and DEFINER

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 'RETURNS STRING SONAME "should_not_parse.so"' at line 2

create table t1(f1 int);

insert into t1 values(1),(2);

explain select myfunc_int(f1) from t1 order by 1;

mysql-test/t/sp-error.test

+5 −2
Original line number Diff line number Diff line
@@ -1744,7 +1744,7 @@ drop procedure bug15091; 
drop function if exists bug16896;

--enable_warnings



--error ER_SP_NO_AGGREGATE

--error ER_PARSE_ERROR

create aggregate function bug16896() returns int return 1;
@@ -2099,7 +2099,10 @@ DROP DATABASE IF EXISTS mysqltest; 
CREATE DATABASE mysqltest;

USE mysqltest;

DROP DATABASE mysqltest;

--error ER_PARSE_ERROR

# Both ER_SP_DOES_NOT_EXIST and ER_PARSE_ERROR are valid here,

# the result is implementation dependent:

# See Bug#29816 for details

--error ER_SP_DOES_NOT_EXIST

SELECT inexistent(), 1 + ,;

--error ER_SP_DOES_NOT_EXIST

SELECT inexistent();

mysql-test/t/sp.test

+29 −0
Original line number Diff line number Diff line
@@ -7671,6 +7671,35 @@ DROP FUNCTION f1; 


###########################################################################



#

# Bug#28318 (CREATE FUNCTION (UDF) requires a schema)

#



--disable_warnings

DROP PROCEDURE IF EXISTS db28318_a.t1;

DROP PROCEDURE IF EXISTS db28318_b.t2;

DROP DATABASE IF EXISTS db28318_a;

DROP DATABASE IF EXISTS db28318_b;

--enable_warnings



CREATE DATABASE db28318_a;

CREATE DATABASE db28318_b;



CREATE PROCEDURE db28318_a.t1() SELECT "db28318_a.t1";

CREATE PROCEDURE db28318_b.t2() CALL t1();



use db28318_a;



# In db28318_b.t2, t1 refers to db28318_b.t1

--error ER_SP_DOES_NOT_EXIST

CALL db28318_b.t2();



DROP PROCEDURE db28318_a.t1;

DROP PROCEDURE db28318_b.t2;

DROP DATABASE db28318_a;

DROP DATABASE db28318_b;





--echo # ------------------------------------------------------------------

--echo # -- End of 5.0 tests

--echo # ------------------------------------------------------------------