diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-03 20:14:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-03 20:14:09 +0300 |
| commit | b6f4cccd191f7d98306db9ebc6e8667ec9e1ec79 (patch) | |
| tree | f530d85bd1ca8b3cb45f6b6d2b0e1e2ac6b24451 /storage/innobase/include/trx0rec.h | |
| parent | 779fb636daf4c127dbb90f75bab004ac1bbe12df (diff) | |
| parent | ce195987c3c995470992f16ca7a985796d6b65a6 (diff) | |
| download | mariadb-git-b6f4cccd191f7d98306db9ebc6e8667ec9e1ec79.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/trx0rec.h')
| -rw-r--r-- | storage/innobase/include/trx0rec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h index bf8835f189f..dd164b7f973 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, 2018, MariaDB Corporation. +Copyright (c) 2017, 2019, 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 @@ -234,7 +234,7 @@ trx_undo_prev_version_build( dtuple if it is not yet created. This heap diffs from "heap" above in that it could be prebuilt->old_vers_heap for selection */ - const dtuple_t**vrow, /*!< out: virtual column info, if any */ + dtuple_t** vrow, /*!< out: virtual column info, if any */ ulint v_status); /*!< in: status determine if it is going into this function by purge thread or not. @@ -280,7 +280,7 @@ void trx_undo_read_v_cols( const dict_table_t* table, const byte* ptr, - const dtuple_t* row, + dtuple_t* row, bool in_purge); /** Read virtual column index from undo log if the undo log contains such |