summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorThirunarayanan Balathandayuthapani <thirunarayanan.balathandayuth@oracle.com>2017-12-27 11:56:11 +0530
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-11 15:52:45 +0300
commit9c03ba8f0d8e579432671d5bdde5f1b5aca3954c (patch)
treee138b667c08f19051dba947536033a56df163c39 /storage
parentc70fc6b16a7ba7a954d7a51d41b930c72a62fbbb (diff)
downloadmariadb-git-9c03ba8f0d8e579432671d5bdde5f1b5aca3954c.tar.gz
Bug #27041445 SERVER ABORTS IF FTS_DOC_ID EXCEEDS FTS_DOC_ID_MAX_STEP
Problem: ======= Multiple insert statement in table contains FULLTEXT KEY and a FTS_DOC_ID column aborts the server if the FTS_DOC_ID exceeds FTS_DOC_ID_MAX_STEP. Solution: ======== Remove the exception for first committed insert statement. Reviewed-by: Jimmy Yang<jimmy.yang@oracle.com> RB: 18023
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/row/row0mysql.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc
index 7a4c5e114c1..838506c8786 100644
--- a/storage/xtradb/row/row0mysql.cc
+++ b/storage/xtradb/row/row0mysql.cc
@@ -1442,8 +1442,7 @@ error_exit:
doc_ids difference should not exceed
FTS_DOC_ID_MAX_STEP value. */
- if (next_doc_id > 1
- && doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) {
+ if (doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) {
fprintf(stderr,
"InnoDB: Doc ID " UINT64PF " is too"
" big. Its difference with largest"