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

MDEV-29771 Server crashes in check_sequence_fields upon CREATE TABLE .. SEQUENCE=1 AS SELECT ..

Browse Source 
Pass name separately for sequence check because sequence can be created with
CREATE TABLE (see https://mariadb.com/kb/en/create-table/#sequence )
This commit is contained in:
Oleksandr Byelkin
2023-09-26 18:17:04 +02:00
parent 554aa1e2b4
commit 2d29ccda1a
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,4 +716,12 @@ CREATE SEQUENCE seq1 START WITH 2;
CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5; CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
ERROR HY000: Trigger's 'seq1' is view, temporary table or sequence ERROR HY000: Trigger's 'seq1' is view, temporary table or sequence
DROP SEQUENCE seq1; 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 # 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; CREATE TRIGGER s1 BEFORE UPDATE ON seq1 FOR EACH ROW SET @a= 5;
DROP SEQUENCE seq1; 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 # End of 10.4 test
--echo #

6
sql/sql_sequence.cc
View File

@ -186,7 +186,8 @@ void sequence_definition::store_fields(TABLE *table)
true Failure true Failure
*/ */
bool check_sequence_fields(LEX *lex, List<Create_field> *fields) bool check_sequence_fields(LEX *lex, List<Create_field> *fields,
const LEX_CSTRING db, const LEX_CSTRING table_name)
{ {
Create_field *field; Create_field *field;
List_iterator_fast<Create_field> it(*fields); List_iterator_fast<Create_field> it(*fields);
@ -234,8 +235,7 @@ bool check_sequence_fields(LEX *lex, List<Create_field> *fields)
err: err:
my_error(ER_SEQUENCE_INVALID_TABLE_STRUCTURE, MYF(0), my_error(ER_SEQUENCE_INVALID_TABLE_STRUCTURE, MYF(0),
lex->first_select_lex()->table_list.first->db.str, db.str, table_name.str, reason);
lex->first_select_lex()->table_list.first->table_name.str, reason);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }

4
sql/sql_sequence.h
View File

@ -162,6 +162,8 @@ public:
class Create_field; class Create_field;
extern bool prepare_sequence_fields(THD *thd, List<Create_field> *fields); extern bool prepare_sequence_fields(THD *thd, List<Create_field> *fields);
extern bool check_sequence_fields(LEX *lex, List<Create_field> *fields); extern bool check_sequence_fields(LEX *lex, List<Create_field> *fields,
const LEX_CSTRING db,
const LEX_CSTRING table_name);
extern bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list); extern bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list);
#endif /* SQL_SEQUENCE_INCLUDED */ #endif /* SQL_SEQUENCE_INCLUDED */

3
sql/sql_table.cc
View File

@ -3471,7 +3471,8 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
} }
/* The user specified fields: check that structure is ok */ /* The user specified fields: check that structure is ok */
if (check_sequence_fields(thd->lex, &alter_info->create_list)) if (check_sequence_fields(thd->lex, &alter_info->create_list,
db, table_name))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }