diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-28 19:40:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-28 19:40:32 +0300 |
| commit | dd5c307cb00bfde6c88bf125f61b3e0d85dc79a5 (patch) | |
| tree | 1d321da67d437848dea2e966f3f40ee33ac43ecf /storage | |
| parent | 547cb280b87831fb02bedd411f8a3486258f8859 (diff) | |
| parent | 2644e52fdbb7943a549f467b4dfd97da2592039d (diff) | |
| download | mariadb-git-dd5c307cb00bfde6c88bf125f61b3e0d85dc79a5.tar.gz | |
MDEV-22394 Merge new release of InnoDB 5.7.30 to 10.2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/innobase/row/row0upd.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index cb81b68e2ab..1c0166f4c3f 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 7 -#define INNODB_VERSION_BUGFIX 29 +#define INNODB_VERSION_BUGFIX 30 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 31d4d31c1f9..3cd2a1ef04f 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2805,8 +2805,7 @@ check_fk: mtr_commit(mtr); err = row_ins_clust_index_entry( - index, entry, thr, - node->upd_ext ? node->upd_ext->n_ext : 0); + index, entry, thr, dtuple_get_n_ext(entry)); node->state = UPD_NODE_INSERT_CLUSTERED; mem_heap_free(heap); |