From 1e270d504d56cb015efe060b319e3a5b9bc6513f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 13 Dec 2015 10:13:18 +0100 Subject: 5.6.27-76.0 --- storage/xtradb/row/row0mysql.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'storage/xtradb/row/row0mysql.cc') diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index 9f7b69acbda..a1bdc732fa4 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -1388,7 +1388,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 */ -- cgit v1.2.1 From 98c9fbfa215242f2930990a0a80b9c5642d23e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 15 Dec 2015 11:27:08 +0200 Subject: MDEV-8297: information_schema.innodb_sys_tablestats.modified_counter doesn't change on UPDATE Update modified-counter also if update effects non-indexed columns. --- storage/xtradb/row/row0mysql.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'storage/xtradb/row/row0mysql.cc') diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index e7d1e9193fa..6bb5a61b635 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -1870,6 +1870,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 = ""; -- cgit v1.2.1