1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-13005: Fixing bugs in SEQUENCE, part 3, 3/5

Browse Source 
Task 3:
Added an additional condition for SEQUENCE option to check if cache < 0.
This commit is contained in:
Rucha Deodhar 2022-03-28 15:12:33 +05:30
parent 0b9842a3e7
commit c6eeacd10f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -698,3 +698,6 @@ ERROR 42S02: Unknown SEQUENCE: 'x'
# Task 2: # Task 2:
CREATE SEQUENCE x START WITH 1 INCREMENT BY 123456789012345678; CREATE SEQUENCE x START WITH 1 INCREMENT BY 123456789012345678;
ERROR HY000: Sequence 'test.x' has out of range value for options ERROR HY000: Sequence 'test.x' has out of range value for options
# Task 3:
CREATE SEQUENCE seq1 START WITH 1 cache -1;
ERROR HY000: Sequence 'test.seq1' has out of range value for options

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

@ -529,3 +529,7 @@ SET @x = PREVIOUS VALUE FOR x;
--echo # Task 2: --echo # Task 2:
--error ER_SEQUENCE_INVALID_DATA --error ER_SEQUENCE_INVALID_DATA
CREATE SEQUENCE x START WITH 1 INCREMENT BY 123456789012345678; CREATE SEQUENCE x START WITH 1 INCREMENT BY 123456789012345678;
--echo # Task 3:
--error ER_SEQUENCE_INVALID_DATA
CREATE SEQUENCE seq1 START WITH 1 cache -1;

2
sql/sql_sequence.cc
View File

@ -121,7 +121,7 @@ bool sequence_definition::check_and_adjust(bool set_reserved_until)
start >= min_value && start >= min_value &&
max_value != LONGLONG_MAX && max_value != LONGLONG_MAX &&
min_value != LONGLONG_MIN && min_value != LONGLONG_MIN &&
cache < (LONGLONG_MAX - max_increment) / max_increment && cache >= 0 && cache < (LONGLONG_MAX - max_increment) / max_increment &&
((real_increment > 0 && reserved_until >= min_value) || ((real_increment > 0 && reserved_until >= min_value) ||
(real_increment < 0 && reserved_until <= max_value))) (real_increment < 0 && reserved_until <= max_value)))
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);