mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2022-04-06 10:06:39 +03:00
commit cacb61b6be
66 changed files with 679 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mysql-test/main/sp.result
View file

@ -8900,6 +8900,19 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
BEGIN
RETURN '';
END' at line 2
#
# MDEV-28220: Assert failure in sp_head::~sp_head on parsing a syntax incorrect statement CREATE SEQUENCE ... RESTART inside CREATE PROCEDURE/CREATE FUNCTION
# Specifying the RESTART clause for the statement CREATE SEQUENCE is a syntax error.
# Check that CREATE PROCEDURE doesn't crash server if the statement
# CREATE SEQUNCE ... RESTART is specified in its body.
#
CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RESTART' at line 1
# CREATE SEQUNCE ... RESTART and CREATE SEQUNCE ... RESTART WITH ... are
# handled by different grammar rules, so check the both cases.
CREATE PROCEDURE sp1() CREATE SEQUENCE s1 START WITH 300 INCREMENT BY 30 RESTART WITH 100;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RESTART' at line 1
# End of 10.3 tests
#
# Start of 10.4 tests
@ -8914,5 +8927,11 @@ END;
$$
ERROR 42000: Incorrect usage/placement of 'HIGH_PRIORITY'
#
# MDEV-21173: Assertion `m_thd == __null' failed in sp_head::~sp_head
#
CREATE TABLE t1 (a INT);
CREATE PROCEDURE p1() SELECT 1 FROM t1 PROCEDURE ANALYSE( 10, (SELECT a FROM t1));
ERROR 42000: PROCEDURE does not support subqueries or stored functions
DROP TABLE t1;
# End of 10.4 tests
#