database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-01 14:42:51 +03:00
parent 842da858b6 9216114ce7
commit 50a11f396a
210 changed files with 5233 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/sp-error.result
View File

@ -452,7 +452,7 @@ else
set b = a;
end if;
end|
ERROR 42S22: Unknown column 'aa' in 'field list'
ERROR 42000: Undeclared variable: aa
create procedure bug4344() drop procedure bug4344|
ERROR HY000: Can't drop or alter a PROCEDURE from within another stored routine
create procedure bug4344() drop function bug4344|
@ -1067,7 +1067,7 @@ IF bug13037_foo THEN
SELECT 1;
END IF;
END|
ERROR 42S22: Unknown column 'bug13037_foo' in 'field list'
ERROR 42000: Undeclared variable: bug13037_foo
CREATE PROCEDURE bug13037_p2()
BEGIN
SET @bug13037_foo = bug13037_bar;