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 pull request #1261 from robertbindar/mdev-17978

Browse Source 
MDEV-17978 Server crash in SHOW CREATE SEQUENCE on a broken view
This commit is contained in:
Robert Bindar
2019-12-05 18:26:52 +02:00
committed by GitHub
parent d759f764f6
commit 1fbd9bb2c5
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sql_sequence/view.result
View File

@ -24,3 +24,13 @@ ERROR 42S02: 'test.v1' is not a SEQUENCE
SELECT PREVIOUS VALUE FOR v1; SELECT PREVIOUS VALUE FOR v1;
ERROR 42S02: 'test.v1' is not a SEQUENCE ERROR 42S02: 'test.v1' is not a SEQUENCE
drop view v1; drop view v1;
#
# MDEV 17978 Server crashes in mysqld_show_create_get_fields
# upon SHOW CREATE SEQUENCE on a broken view
#
CREATE TABLE t1 (a INT);
CREATE VIEW v1 AS SELECT * FROM t1;
DROP TABLE t1;
SHOW CREATE SEQUENCE v1;
ERROR 42S02: 'test.v1' is not a SEQUENCE
DROP VIEW v1;

11
mysql-test/suite/sql_sequence/view.test
View File

@ -27,3 +27,14 @@ SELECT NEXT VALUE FOR v1;
--error ER_NOT_SEQUENCE --error ER_NOT_SEQUENCE
SELECT PREVIOUS VALUE FOR v1; SELECT PREVIOUS VALUE FOR v1;
drop view v1; drop view v1;
--echo #
--echo # MDEV 17978 Server crashes in mysqld_show_create_get_fields
--echo # upon SHOW CREATE SEQUENCE on a broken view
--echo #
CREATE TABLE t1 (a INT);
CREATE VIEW v1 AS SELECT * FROM t1;
DROP TABLE t1;
--error ER_NOT_SEQUENCE
SHOW CREATE SEQUENCE v1;
DROP VIEW v1;

3
sql/sql_show.cc
View File

@ -1316,7 +1316,8 @@ mysqld_show_create_get_fields(THD *thd, TABLE_LIST *table_list,
goto exit; goto exit;
} }
else if (lex->table_type == TABLE_TYPE_SEQUENCE && else if (lex->table_type == TABLE_TYPE_SEQUENCE &&
table_list->table->s->table_type != TABLE_TYPE_SEQUENCE) (!table_list->table ||
table_list->table->s->table_type != TABLE_TYPE_SEQUENCE))
{ {
my_error(ER_NOT_SEQUENCE, MYF(0), my_error(ER_NOT_SEQUENCE, MYF(0),
table_list->db.str, table_list->table_name.str); table_list->db.str, table_list->table_name.str);