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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/sql_sequence/create.result
View File

@ -715,4 +715,12 @@ CREATE SEQUENCE seq1 START WITH 2;
CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
ERROR HY000: Trigger's 'seq1' is a view, temporary table or sequence
DROP SEQUENCE seq1;
#
# MDEV-29771: Server crashes in check_sequence_fields upon
# CREATE TABLE .. SEQUENCE=1 AS SELECT ..
#
create table s sequence=1 as select 1;
ERROR HY000: Sequence 'test.s' table structure is invalid (Wrong number of columns)
#
# End of 10.4 test
#

10
mysql-test/suite/sql_sequence/create.test
View File

@ -554,4 +554,14 @@ CREATE SEQUENCE seq1 START WITH 2;
CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
DROP SEQUENCE seq1;
--echo #
--echo # MDEV-29771: Server crashes in check_sequence_fields upon
--echo # CREATE TABLE .. SEQUENCE=1 AS SELECT ..
--echo #
--error ER_SEQUENCE_INVALID_TABLE_STRUCTURE
create table s sequence=1 as select 1;
--echo #
--echo # End of 10.4 test
--echo #

30
mysql-test/suite/sql_sequence/other.result
View File

@ -358,4 +358,34 @@ Note 4092 Unknown VIEW: 'test.s'
DROP VIEW v1;
DROP SEQUENCE s;
DROP TABLE t;
#
# End of 10.3 tests
#
#
# MDEV-32541 Assertion `!(thd->server_status & (1U | 8192U))' failed in MDL_context::release_transactional_locks
#
create sequence s1;
create sequence s2;
connect con1,localhost,root,,;
set session transaction read only;
start transaction;
connection default;
start transaction;
insert into s2 values (1, 1, 10000, 100, 1, 1000, 0, 0);
connection con1;
select lastval(s1);
lastval(s1)
NULL
select lastval(s2);;
connection default;
set lock_wait_timeout= 1;
insert into s1 values (1, 1, 10000, 100, 1, 1000, 0, 0);
connection con1;
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
disconnect con1;
connection default;
drop sequence s1;
drop sequence s2;
#
# End of 10.4 tests
#

35
mysql-test/suite/sql_sequence/other.test
View File

@ -385,4 +385,39 @@ DROP VIEW IF EXISTS s;
DROP VIEW v1;
DROP SEQUENCE s;
DROP TABLE t;
--echo #
--echo # End of 10.3 tests
--echo #
--echo #
--echo # MDEV-32541 Assertion `!(thd->server_status & (1U | 8192U))' failed in MDL_context::release_transactional_locks
--echo #
create sequence s1;
create sequence s2;
--connect (con1,localhost,root,,)
set session transaction read only;
start transaction;
--connection default
start transaction;
insert into s2 values (1, 1, 10000, 100, 1, 1000, 0, 0);
--connection con1
select lastval(s1);
--send select lastval(s2);
--connection default
set lock_wait_timeout= 1;
insert into s1 values (1, 1, 10000, 100, 1, 1000, 0, 0);
--connection con1
--error ER_LOCK_DEADLOCK
--reap
--disconnect con1
--connection default
drop sequence s1;
drop sequence s2;
--echo #
--echo # End of 10.4 tests
--echo #