Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2019-01-06 17:43:02 +02:00
commit 734510a44d
155 changed files with 2048 additions and 2619 deletions

View file

@ -10239,3 +10239,37 @@ CREATE TABLE t1 AS SELECT f1() AS c1, COALESCE(f1()) AS c2, CONCAT(f1()) AS c3;
SHOW CREATE TABLE t1;
DROP TABLE t1;
DROP FUNCTION f1;
--echo #
--echo # MDEV-16036: Debug assertion failed in resignal on create
--echo # temporary table
--echo #
set @save_sql_mode= @@sql_mode;
set sql_mode='ORACLE';
delimiter /;
CREATE or replace procedure p4()
AS
CONTINUE HANDLER FOR SQLWARNING
BEGIN
NULL;
END;
EXIT HANDLER FOR OTHERS -- SQLEXCEPTION
BEGIN
GET DIAGNOSTICS CONDITION 1 @sqlstate = RETURNED_SQLSTATE, @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT;
SELECT @sqlstate, @errno, @text;
SHOW WARNINGS;
RESIGNAL; -- cause DBG_ASSERT failed
END;
BEGIN
CREATE TEMPORARY TABLE IF NOT EXISTS t1(origine VARCHAR2(10) NOT NULL);
END
/
delimiter ;/
call p4();
call p4();
drop procedure p4;
drop table t1;
set @@sql_mode=@save_sql_mode;
--echo # End of 10.3 tests