Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions mysql-test/suite/maria/fulltext_parser_drop.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# DROP TABLE of an Aria table with a fulltext parser plugin
# must not warn about an unsupported extension
#
INSTALL PLUGIN simple_parser SONAME 'mypluglib';
CREATE TABLE t1 (a TEXT, FULLTEXT(a) WITH PARSER simple_parser) ENGINE=Aria;
INSERT INTO t1 VALUES ('hello world');
DROP TABLE t1;
CREATE TABLE t1 (a TEXT, FULLTEXT(a) WITH PARSER simple_parser)
ENGINE=Aria TRANSACTIONAL=0;
DROP TABLE t1;
UNINSTALL PLUGIN simple_parser;
15 changes: 15 additions & 0 deletions mysql-test/suite/maria/fulltext_parser_drop.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--source include/have_simple_parser.inc

--echo #
--echo # DROP TABLE of an Aria table with a fulltext parser plugin
--echo # must not warn about an unsupported extension
--echo #

INSTALL PLUGIN simple_parser SONAME 'mypluglib';
CREATE TABLE t1 (a TEXT, FULLTEXT(a) WITH PARSER simple_parser) ENGINE=Aria;
INSERT INTO t1 VALUES ('hello world');
DROP TABLE t1;
CREATE TABLE t1 (a TEXT, FULLTEXT(a) WITH PARSER simple_parser)
ENGINE=Aria TRANSACTIONAL=0;
DROP TABLE t1;
UNINSTALL PLUGIN simple_parser;
2 changes: 1 addition & 1 deletion storage/maria/ma_open.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags,
goto err;
}
if ((share->options & HA_OPTION_RELIES_ON_SQL_LAYER) &&
! (open_flags & HA_OPEN_FROM_SQL_LAYER))
! (open_flags & (HA_OPEN_FROM_SQL_LAYER | HA_OPEN_FOR_DROP)))
{
DBUG_PRINT("error", ("table cannot be opened from non-sql layer"));
my_errno= HA_ERR_UNSUPPORTED;
Expand Down