← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to storage/innobase/fts/fts0opt.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-04-16 20:07:10 UTC
  • mto: (1.3.9 vivid-proposed)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20150416200710-pcrsa022082zj46k
Tags: upstream-5.6.24
Import upstream version 5.6.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/fts/fts0opt.cc
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
 
3
Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
42
42
/** The FTS optimize thread's work queue. */
43
43
static ib_wqueue_t* fts_optimize_wq;
44
44
 
45
 
/** The number of document ids to delete in one statement. */
46
 
static const ulint FTS_MAX_DELETE_DOC_IDS = 1000;
47
 
 
48
45
/** Time to wait for a message. */
49
46
static const ulint FTS_QUEUE_WAIT_IN_USECS = 5000000;
50
47
 
1154
1151
        }
1155
1152
 
1156
1153
        /* Calculate the space required to store the ilist. */
 
1154
        ut_ad(doc_id > node->last_doc_id);
1157
1155
        doc_id_delta = doc_id - node->last_doc_id;
1158
1156
        enc_len = fts_get_encoded_len(static_cast<ulint>(doc_id_delta));
1159
1157
 
1396
1394
 
1397
1395
                src_node = (fts_node_t*) ib_vector_get(word->nodes, i);
1398
1396
 
1399
 
                if (!dst_node) {
 
1397
                if (dst_node == NULL
 
1398
                    || dst_node->last_doc_id > src_node->first_doc_id) {
1400
1399
 
1401
1400
                        dst_node = static_cast<fts_node_t*>(
1402
1401
                                ib_vector_push(nodes, NULL));