1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '10.4' into 10.5

This commit is contained in:
Sergei Golubchik
2022-05-09 22:04:06 +02:00
266 changed files with 7707 additions and 2404 deletions

View File

@ -1402,6 +1402,30 @@ SELECT tmp 1.e.test FROM scientific_notation AS tmp;
DROP TABLE scientific_notation;
--echo #
--echo # MDEV-6899 extra semicolon in show create event syntax
--echo #
set timestamp=unix_timestamp('2020-10-10 5:5:5');
create table t1 (a int);
delimiter $;
create trigger a before insert on t1 for each row set @a:=1;select 2$
delimiter ;$
query_vertical show create trigger a;
drop table t1;
delimiter $;
create procedure a() select 1;select 2$
delimiter ;$
query_vertical show create procedure a;
drop procedure a;
delimiter $;
create function a() returns int return 1;select 2$
delimiter ;$
query_vertical show create function a;
drop function a;
set timestamp=default;
--echo #
--echo # End of 10.2 tests
--echo #