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 '11.5' into 11.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-21 13:28:32 +02:00
parent 10b885907a 342fa29615
commit 492a7c2430
107 changed files with 2996 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/sql_sequence/auto_increment.result
View File

@ -47,5 +47,20 @@ create sequence s as bigint start with -9223372036854775805 minvalue -9223372036
drop sequence s;
set global auto_increment_increment= default, auto_increment_offset= default;
#
# End of 11.4 tests
# MDEV-33836 Assertion `(ulonglong) next_free_value % real_increment == (ulonglong) offset' failed in void sequence_definition::adjust_values(longlong)
#
CREATE SEQUENCE s AS BIGINT UNSIGNED START WITH 9223372036854775800 INCREMENT 0;
set @old_AUTO_INCREMENT_INCREMENT=@@global.AUTO_INCREMENT_INCREMENT;
set global AUTO_INCREMENT_INCREMENT=10;
SELECT NEXTVAL (s);
NEXTVAL (s)
9223372036854775800
FLUSH TABLES WITH READ LOCK;
UPDATE s SET a=1;
Got one of the listed errors
unlock tables;
set global AUTO_INCREMENT_INCREMENT=@old_AUTO_INCREMENT_INCREMENT;
drop sequence s;
#
# End of 11.5 tests
#

19
mysql-test/suite/sql_sequence/auto_increment.test
View File

@ -48,8 +48,25 @@ create sequence s as bigint start with -9223372036854775805 minvalue -9223372036
drop sequence s;
set global auto_increment_increment= default, auto_increment_offset= default;
--echo #
--echo # MDEV-33836 Assertion `(ulonglong) next_free_value % real_increment == (ulonglong) offset' failed in void sequence_definition::adjust_values(longlong)
--echo #
CREATE SEQUENCE s AS BIGINT UNSIGNED START WITH 9223372036854775800 INCREMENT 0;
set @old_AUTO_INCREMENT_INCREMENT=@@global.AUTO_INCREMENT_INCREMENT;
set global AUTO_INCREMENT_INCREMENT=10;
SELECT NEXTVAL (s);
FLUSH TABLES WITH READ LOCK;
# ER_CANT_UPDATE_WITH_READLOCK when executed normally
# ER_BAD_FIELD_ERROR when executed as a prepared statement
--error ER_CANT_UPDATE_WITH_READLOCK,ER_BAD_FIELD_ERROR
UPDATE s SET a=1;
unlock tables;
set global AUTO_INCREMENT_INCREMENT=@old_AUTO_INCREMENT_INCREMENT;
drop sequence s;
--enable_ps2_protocol
--echo #
--echo # End of 11.4 tests
--echo # End of 11.5 tests
--echo #

2
mysql-test/suite/sql_sequence/concurrent_create.result
View File

@ -62,5 +62,5 @@ next_not_cached_value minimum_value maximum_value start_value increment cache_si
1 1 16777214 1 1 1000 0 0
DROP SEQUENCE s1, s2;
#
# End of 11.4 tests
# End of 11.5 tests
#

2
mysql-test/suite/sql_sequence/concurrent_create.test
View File

@ -94,5 +94,5 @@ select * from s2;
DROP SEQUENCE s1, s2;
--echo #
--echo # End of 11.4 tests
--echo # End of 11.5 tests
--echo #

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

@ -1342,5 +1342,5 @@ def test s8 bigint 64 2 0 1 1 9223372036854775806 1 0
def test s9 tinyint unsigned 8 2 0 1 1 254 1 0
drop sequence s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
#
# End of 11.4 tests
# End of 11.5 tests
#

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

@ -767,5 +767,5 @@ select * from information_schema.sequences order by sequence_name;
drop sequence s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
--echo #
--echo # End of 11.4 tests
--echo # End of 11.5 tests
--echo #

2
mysql-test/suite/sql_sequence/mysqldump.result
View File

@ -181,5 +181,5 @@ DROP DATABASE test1;
DROP DATABASE test2;
set sql_mode=default;
#
# End of 11.4 tests
# End of 11.5 tests
#

2
mysql-test/suite/sql_sequence/mysqldump.test
View File

@ -117,5 +117,5 @@ DROP DATABASE test2;
set sql_mode=default;
--echo #
--echo # End of 11.4 tests
--echo # End of 11.5 tests
--echo #

2
mysql-test/suite/sql_sequence/next.result
View File

@ -848,5 +848,5 @@ next value for t1
18446744073709551614
drop sequence t1;
#
# End of 11.4 tests
# End of 11.5 tests
#

2
mysql-test/suite/sql_sequence/next.test
View File

@ -480,5 +480,5 @@ select next value for t1;
drop sequence t1;
--echo #
--echo # End of 11.4 tests
--echo # End of 11.5 tests
--echo #

13
mysql-test/suite/sql_sequence/setval.result
View File

@ -418,4 +418,15 @@ setval(s, 32767)
select nextval(s);
ERROR HY000: Sequence 'test.s' has run out
drop sequence s;
# End of 11.4 tests
#
# MDEV-33836 Assertion `(ulonglong) next_free_value % real_increment == (ulonglong) offset' failed in void sequence_definition::adjust_values(longlong)
#
CREATE SEQUENCE s AS BIGINT UNSIGNED START WITH 9223372036854775800 INCREMENT 0;
set @old_AUTO_INCREMENT_INCREMENT=@@global.AUTO_INCREMENT_INCREMENT;
set global AUTO_INCREMENT_INCREMENT=100;
SELECT SETVAL (s,12345678901234567890);
SETVAL (s,12345678901234567890)
12345678901234567890
drop sequence s;
set global AUTO_INCREMENT_INCREMENT=@old_AUTO_INCREMENT_INCREMENT;
# End of 11.5 tests

13
mysql-test/suite/sql_sequence/setval.test
View File

@ -253,4 +253,15 @@ select nextval(s);
drop sequence s;
--enable_ps2_protocol
--echo # End of 11.4 tests
--echo #
--echo # MDEV-33836 Assertion `(ulonglong) next_free_value % real_increment == (ulonglong) offset' failed in void sequence_definition::adjust_values(longlong)
--echo #
CREATE SEQUENCE s AS BIGINT UNSIGNED START WITH 9223372036854775800 INCREMENT 0;
set @old_AUTO_INCREMENT_INCREMENT=@@global.AUTO_INCREMENT_INCREMENT;
set global AUTO_INCREMENT_INCREMENT=100;
SELECT SETVAL (s,12345678901234567890);
drop sequence s;
set global AUTO_INCREMENT_INCREMENT=@old_AUTO_INCREMENT_INCREMENT;
--echo # End of 11.5 tests