summaryrefslogtreecommitdiff
path: root/storage/xtradb/row/row0merge.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-21 14:20:09 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-21 14:20:09 +0200
commitb42664e85e2cd512245de4fde94237a502fdbedb (patch)
tree8bfeae1dc8a94983d55535ac00d54427bb5cb5a5 /storage/xtradb/row/row0merge.cc
parent5b8ac23030a59a8ed3636d441180fec571dbe3d1 (diff)
downloadmariadb-git-b42664e85e2cd512245de4fde94237a502fdbedb.tar.gz
5.6.30-76.3
Diffstat (limited to 'storage/xtradb/row/row0merge.cc')
-rw-r--r--storage/xtradb/row/row0merge.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/row/row0merge.cc b/storage/xtradb/row/row0merge.cc
index ecf7e5bb116..48c165bbc54 100644
--- a/storage/xtradb/row/row0merge.cc
+++ b/storage/xtradb/row/row0merge.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2005, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -1992,7 +1992,8 @@ wait_again:
if (max_doc_id && err == DB_SUCCESS) {
/* Sync fts cache for other fts indexes to keep all
fts indexes consistent in sync_doc_id. */
- err = fts_sync_table(const_cast<dict_table_t*>(new_table));
+ err = fts_sync_table(const_cast<dict_table_t*>(new_table),
+ false, true);
if (err == DB_SUCCESS) {
fts_update_next_doc_id(