database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-11 20:09:34 +02:00
parent a8650b64ed 1ea6ac3c95
commit a4b7232b2c
46 changed files with 632 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/innodb_fts/r/fulltext.result
View File

@@ -689,3 +689,17 @@ FTS_DOC_ID t
2 foo bar
3 foo
DROP TABLE t;
#
# MDEV-25070 SIGSEGV in fts_create_in_mem_aux_table
#
CREATE TABLE t1 (a CHAR, FULLTEXT KEY(a)) ENGINE=InnoDB;
ALTER TABLE t1 DISCARD TABLESPACE;
ALTER TABLE t1 ADD FULLTEXT INDEX (a);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(1) DEFAULT NULL,
FULLTEXT KEY `a` (`a`),
FULLTEXT KEY `a_2` (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
DROP TABLE t1;