Skip to content

Commit b6169e2

Browse files
author
Jimmy Yang
committed
Implement WL #5538 InnoDB Full-Text Search Support, merge
mysql-5.6-labs-innodb-fts into mysql-trunk
2 parents 5e01151 + 063d34e commit b6169e2

File tree

169 files changed

+47510
-2291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+47510
-2291
lines changed

‎include/my_base.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ enum ha_base_keytype {
450450
#define HA_ERR_INDEX_COL_TOO_LONG 179 /* Index column length exceeds limit */
451451
#define HA_ERR_INDEX_CORRUPT 180 /* InnoDB index corrupted */
452452
#define HA_ERR_UNDO_REC_TOO_BIG 181 /* Undo log record too big */
453-
#define HA_ERR_LAST 181 /* Copy of last error nr */
453+
#define HA_FTS_INVALID_DOCID 182 /* Invalid InnoDB Doc ID */
454+
#define HA_ERR_LAST 182 /* Copy of last error nr */
454455

455456
/* Number of different errors */
456457
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)

‎mysql-test/collections/default.push

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
22
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
33
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
4+
perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_fts_tests --vardir=var-innodb_fts_tests --suite=innodb_fts --no-default-myisam --experimental=collections/default.experimental --skip-ndb

‎mysql-test/mysql-test-run.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ END
163163

164164
# If you add a new suite, please check TEST_DIRS in Makefile.am.
165165
#
166-
my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,perfschema,funcs_1,opt_trace";
166+
my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,perfschema,funcs_1,opt_trace";
167167
my $opt_suites;
168168

169169
our $opt_verbose= 0; # Verbose output, enable with --verbose

‎mysql-test/r/information_schema.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,8 +879,8 @@ TABLES TABLE_NAME select
879879
TABLE_CONSTRAINTS TABLE_NAME select
880880
TABLE_PRIVILEGES TABLE_NAME select
881881
VIEWS TABLE_NAME select
882-
INNODB_BUFFER_PAGE TABLE_NAME select
883882
INNODB_BUFFER_PAGE_LRU TABLE_NAME select
883+
INNODB_BUFFER_PAGE TABLE_NAME select
884884
delete from mysql.user where user='mysqltest_4';
885885
delete from mysql.db where user='mysqltest_4';
886886
flush privileges;

‎mysql-test/r/mysqlshow.result

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,31 @@ Database: information_schema
110110
| TRIGGERS |
111111
| USER_PRIVILEGES |
112112
| VIEWS |
113-
| INNODB_CMPMEM |
113+
| INNODB_LOCKS |
114114
| INNODB_TRX |
115-
| INNODB_BUFFER_PAGE |
115+
| INNODB_FT_CONFIG |
116116
| INNODB_LOCK_WAITS |
117117
| INNODB_SYS_TABLESTATS |
118118
| INNODB_CMP |
119-
| INNODB_SYS_COLUMNS |
119+
| INNODB_CMPMEM |
120120
| INNODB_CMPMEM_RESET |
121-
| INNODB_SYS_FOREIGN_COLS |
122-
| INNODB_BUFFER_PAGE_LRU |
123-
| INNODB_BUFFER_POOL_STATS |
124121
| INNODB_CMP_RESET |
122+
| INNODB_BUFFER_PAGE_LRU |
123+
| INNODB_FT_DELETED |
124+
| INNODB_FT_DEFAULT_STOPWORD |
125125
| INNODB_SYS_FOREIGN |
126-
| INNODB_METRICS |
126+
| INNODB_BUFFER_POOL_STATS |
127127
| INNODB_SYS_INDEXES |
128-
| INNODB_LOCKS |
129-
| INNODB_SYS_FIELDS |
130128
| INNODB_SYS_TABLES |
129+
| INNODB_SYS_FIELDS |
130+
| INNODB_FT_INDEX_CACHE |
131+
| INNODB_BUFFER_PAGE |
132+
| INNODB_FT_BEING_DELETED |
133+
| INNODB_FT_INDEX_TABLE |
134+
| INNODB_METRICS |
135+
| INNODB_SYS_COLUMNS |
136+
| INNODB_FT_INSERTED |
137+
| INNODB_SYS_FOREIGN_COLS |
131138
+---------------------------------------+
132139
Database: INFORMATION_SCHEMA
133140
+---------------------------------------+
@@ -164,24 +171,31 @@ Database: INFORMATION_SCHEMA
164171
| TRIGGERS |
165172
| USER_PRIVILEGES |
166173
| VIEWS |
167-
| INNODB_CMPMEM |
174+
| INNODB_LOCKS |
168175
| INNODB_TRX |
169-
| INNODB_BUFFER_PAGE |
176+
| INNODB_FT_CONFIG |
170177
| INNODB_LOCK_WAITS |
171178
| INNODB_SYS_TABLESTATS |
172179
| INNODB_CMP |
173-
| INNODB_SYS_COLUMNS |
180+
| INNODB_CMPMEM |
174181
| INNODB_CMPMEM_RESET |
175-
| INNODB_SYS_FOREIGN_COLS |
176-
| INNODB_BUFFER_PAGE_LRU |
177-
| INNODB_BUFFER_POOL_STATS |
178182
| INNODB_CMP_RESET |
183+
| INNODB_BUFFER_PAGE_LRU |
184+
| INNODB_FT_DELETED |
185+
| INNODB_FT_DEFAULT_STOPWORD |
179186
| INNODB_SYS_FOREIGN |
180-
| INNODB_METRICS |
187+
| INNODB_BUFFER_POOL_STATS |
181188
| INNODB_SYS_INDEXES |
182-
| INNODB_LOCKS |
183-
| INNODB_SYS_FIELDS |
184189
| INNODB_SYS_TABLES |
190+
| INNODB_SYS_FIELDS |
191+
| INNODB_FT_INDEX_CACHE |
192+
| INNODB_BUFFER_PAGE |
193+
| INNODB_FT_BEING_DELETED |
194+
| INNODB_FT_INDEX_TABLE |
195+
| INNODB_METRICS |
196+
| INNODB_SYS_COLUMNS |
197+
| INNODB_FT_INSERTED |
198+
| INNODB_SYS_FOREIGN_COLS |
185199
+---------------------------------------+
186200
Wildcard: inf_rmation_schema
187201
+--------------------+

‎mysql-test/suite/innodb/r/innodb.result

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,10 +1574,6 @@ ERROR 42S21: Duplicate column name 'c1'
15741574
alter table t1 add key (c1,c1,c2);
15751575
ERROR 42S21: Duplicate column name 'c1'
15761576
drop table t1;
1577-
CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
1578-
SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
1579-
ERROR HY000: The used table type doesn't support FULLTEXT indexes
1580-
DROP TABLE t1;
15811577
CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY (a_id)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
15821578
INSERT INTO t1 VALUES (1),(2),(3);
15831579
CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),

‎mysql-test/suite/innodb/t/innodb.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,10 +1236,10 @@ drop table t1;
12361236
# engines does not fail
12371237
#
12381238

1239-
CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
1240-
--error 1214
1241-
SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
1242-
DROP TABLE t1;
1239+
#CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
1240+
#--error 1214
1241+
#SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
1242+
#DROP TABLE t1;
12431243

12441244
#
12451245
# check null values #1

0 commit comments

Comments
 (0)