1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-22394 Merge new release of InnoDB 5.7.30 to 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2020-04-28 19:40:32 +03:00
commit dd5c307cb0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/include/univ.i
View File

@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 7 #define INNODB_VERSION_MINOR 7
#define INNODB_VERSION_BUGFIX 29 #define INNODB_VERSION_BUGFIX 30
/* The following is the InnoDB version as shown in /* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins; SELECT plugin_version FROM information_schema.plugins;

3
storage/innobase/row/row0upd.cc
View File

@ -2805,8 +2805,7 @@ check_fk:
mtr_commit(mtr); mtr_commit(mtr);
err = row_ins_clust_index_entry( err = row_ins_clust_index_entry(
index, entry, thr, index, entry, thr, dtuple_get_n_ext(entry));
node->upd_ext ? node->upd_ext->n_ext : 0);
node->state = UPD_NODE_INSERT_CLUSTERED; node->state = UPD_NODE_INSERT_CLUSTERED;
mem_heap_free(heap); mem_heap_free(heap);