diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /storage/xtradb/row/row0mysql.cc | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/xtradb/row/row0mysql.cc')
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index 592c0baf552..55e685ac19c 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -1399,7 +1399,8 @@ error_exit: return(err); } - if (dict_table_has_fts_index(table)) { + if (dict_table_has_fts_index(table) + && UNIV_LIKELY(!thr_get_trx(thr)->fake_changes)) { doc_id_t doc_id; /* Extract the doc id from the hidden FTS column */ @@ -1886,6 +1887,12 @@ run_again: columns would not affect statistics. */ if (node->is_delete || !(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { row_update_statistics_if_needed(prebuilt->table); + } else { + /* Update the table modification counter even when + non-indexed columns change if statistics is initialized. */ + if (prebuilt->table->stat_initialized) { + prebuilt->table->stat_modified_counter++; + } } trx->op_info = ""; |