diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
| commit | 5a92ccbaea1bb3973e23846a741f5694a1e687bd (patch) | |
| tree | aafc504552502b48b79cadcb06b2b5c7eba4f374 /storage/innobase/fts/fts0config.cc | |
| parent | c997af7d1f432dfca922958453f0e2313287f1eb (diff) | |
| parent | c016ea660ede8b7ff75f8ca65f73e2958262263a (diff) | |
| download | mariadb-git-5a92ccbaea1bb3973e23846a741f5694a1e687bd.tar.gz | |
Merge 10.3 into 10.4
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
Diffstat (limited to 'storage/innobase/fts/fts0config.cc')
| -rw-r--r-- | storage/innobase/fts/fts0config.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/fts/fts0config.cc b/storage/innobase/fts/fts0config.cc index fd7422171f0..410d60a5f4e 100644 --- a/storage/innobase/fts/fts0config.cc +++ b/storage/innobase/fts/fts0config.cc @@ -215,8 +215,7 @@ fts_config_set_value( pars_info_bind_varchar_literal(info, "value", value->f_str, value->f_len); - const bool dict_locked = fts_table->table->fts->fts_status - & TABLE_DICT_LOCKED; + const bool dict_locked = fts_table->table->fts->dict_locked; fts_table->suffix = "CONFIG"; fts_get_table_name(fts_table, table_name, dict_locked); |