summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0rec.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-02 21:52:46 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-02 21:52:46 +0200
commit51e4650ed0644ed88cf5d542bd0cab50e7ea0343 (patch)
treeaaf73f6a77c6c1ad03473f4d664356b6f60169c9 /storage/innobase/include/trx0rec.h
parenteef2bc5a5c30eef43eee035e23b87286a8dd50bd (diff)
parent20fab71b144f85be9e2ccc145d24d257b0e9df7e (diff)
downloadmariadb-git-51e4650ed0644ed88cf5d542bd0cab50e7ea0343.tar.gz
Merge 5.5 into 10.0
Diffstat (limited to 'storage/innobase/include/trx0rec.h')
-rw-r--r--storage/innobase/include/trx0rec.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 630818a8648..ec15250ec7b 100644
--- a/storage/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, MariaDB Corporation.
+Copyright (c) 2017, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -196,6 +196,7 @@ trx_undo_rec_get_partial_row(
used, as we do NOT copy the data in the
record! */
dict_index_t* index, /*!< in: clustered index */
+ const upd_t* update, /*!< in: updated columns */
dtuple_t** row, /*!< out, own: partial row */
ibool ignore_prefix, /*!< in: flag to indicate if we
expect blob prefixes in undo. Used