Commit ae22204c authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

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

into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
parents b2fec887 05cf10bd

mysql-test/r/sp-error.result

+13 −0
Original line number Diff line number Diff line
@@ -1452,3 +1452,16 @@ end 
until true end repeat retry;

end//

ERROR 42000: LEAVE with no matching label: retry

DROP DATABASE IF EXISTS mysqltest;

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

SELECT inexistent();

ERROR 42000: FUNCTION inexistent does not exist

SELECT .inexistent();

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

SELECT ..inexistent();

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 '.inexistent()' at line 1

USE test;

mysql-test/r/sp.result

+3 −3
Original line number Diff line number Diff line
@@ -5667,7 +5667,6 @@ t3_id_1 t3_id_2 t4_id 
DROP PROCEDURE p1|

DROP VIEW v1, v2|

DROP TABLE t3, t4|

End of 5.0 tests

DROP TABLE IF EXISTS bug23760|

DROP TABLE IF EXISTS bug23760_log|

DROP PROCEDURE IF EXISTS bug23760_update_log|
@@ -6145,7 +6144,6 @@ Procedure sql_mode Create Procedure 
proc_21513		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_21513`()

`my_label`:BEGIN END

drop procedure proc_21513|

End of 5.0 tests.

drop table t1,t2;

CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;

CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;
@@ -6565,4 +6563,6 @@ f1() 
DROP TABLE t1;

DROP FUNCTION f1;



End of 5.0 tests
 
# ------------------------------------------------------------------

# -- End of 5.0 tests

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

mysql-test/r/udf.result

+7 −0
Original line number Diff line number Diff line
@@ -296,4 +296,11 @@ Qcache_queries_in_cache 0 
drop table t1;

drop function metaphon;

set GLOBAL query_cache_size=default;

DROP DATABASE IF EXISTS mysqltest;

CREATE DATABASE mysqltest;

USE mysqltest;

DROP DATABASE mysqltest;

CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";

DROP FUNCTION metaphon;

USE test;

End of 5.0 tests.

mysql-test/t/sp-error.test

+20 −0
Original line number Diff line number Diff line
@@ -2089,6 +2089,26 @@ end// 


delimiter ;//



#

# Bug#29816 Syntactically wrong query fails with misleading error message

#



--disable_warnings

DROP DATABASE IF EXISTS mysqltest;

--enable_warnings

CREATE DATABASE mysqltest;

USE mysqltest;

DROP DATABASE mysqltest;

--error ER_PARSE_ERROR

SELECT inexistent(), 1 + ,;

--error ER_SP_DOES_NOT_EXIST

SELECT inexistent();

--error ER_PARSE_ERROR

SELECT .inexistent();

--error ER_PARSE_ERROR

SELECT ..inexistent();

USE test;



#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/sp.test

+3 −7
Original line number Diff line number Diff line
@@ -6642,9 +6642,6 @@ DROP VIEW v1, v2| 
DROP TABLE t3, t4|





--echo End of 5.0 tests





#

# BUG#23760: ROW_COUNT() and store procedure not owrking together

#
@@ -7076,9 +7073,6 @@ show create procedure proc_21513| 


drop procedure proc_21513|



###

--echo End of 5.0 tests.



#

# BUG#NNNN: New bug synopsis

#
@@ -7677,4 +7671,6 @@ DROP FUNCTION f1; 


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



--echo End of 5.0 tests
 
--echo # ------------------------------------------------------------------

--echo # -- End of 5.0 tests

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