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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/sp.test
View File

@ -19,9 +19,9 @@
# Tests that require multibyte character sets, which are not always available,
# go into separate files (e.g. sp-ucs2.test)
if (`SELECT $PS_PROTOCOL != 0`)
if (`SELECT $PS_PROTOCOL + $CURSOR_PROTOCOL > 0`)
{
--skip Need regular protocol but ps-protocol was specified
--skip Need regular protocol but ps-protocol and cursor-protocol were specified
}
--source include/default_charset.inc
@ -3024,8 +3024,10 @@ create procedure bug5251()
begin
end|
--disable_cursor_protocol
select created into @c1 from mysql.proc
where db='test' and name='bug5251'|
--enable_cursor_protocol
--sleep 2
alter procedure bug5251 comment 'foobar'|
select count(*) from mysql.proc
@ -8255,12 +8257,16 @@ drop procedure if exists p;
--enable_warnings
set @old_mode= @@sql_mode;
set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
--disable_cursor_protocol
select @@sql_mode into @full_mode;
--enable_cursor_protocol
create procedure p() as begin end;
call p();
set @@sql_mode= @old_mode;
# Rename SQL modes that differ in name between the server and the table definition.
--disable_cursor_protocol
select replace(@full_mode, 'ALLOW_INVALID_DATES', 'INVALID_DATES') into @full_mode;
--enable_cursor_protocol
select name from mysql.proc where name = 'p' and sql_mode = @full_mode;
drop procedure p;