diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-12-29 21:55:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:17 +0100 |
| commit | 9cdf494197ae53fef5712ab9cbdecbed98462f1f (patch) | |
| tree | 3725e0e866586f6875f4229c9a33fdb7790f6a58 /storage/xtradb/include/fil0fil.h | |
| parent | d7d589dc01f6d70d1518b74d46fd3b75e76267f5 (diff) | |
| download | mariadb-git-9cdf494197ae53fef5712ab9cbdecbed98462f1f.tar.gz | |
Fixed XtraDB implementation of encryption and page encryption.
Diffstat (limited to 'storage/xtradb/include/fil0fil.h')
| -rw-r--r-- | storage/xtradb/include/fil0fil.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/xtradb/include/fil0fil.h b/storage/xtradb/include/fil0fil.h index f271522bbe9..360a26df776 100644 --- a/storage/xtradb/include/fil0fil.h +++ b/storage/xtradb/include/fil0fil.h @@ -959,8 +959,8 @@ fil_space_get_n_reserved_extents( Reads or writes data. This operation is asynchronous (aio). @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do i/o on a tablespace which does not exist */ -#define fil_io(type, sync, space_id, zip_size, block_offset, byte_offset, len, buf, message, write_size) \ - _fil_io(type, sync, space_id, zip_size, block_offset, byte_offset, len, buf, message, write_size, NULL) +#define fil_io(type, sync, space_id, zip_size, block_offset, byte_offset, len, buf, message, write_size, lsn) \ + _fil_io(type, sync, space_id, zip_size, block_offset, byte_offset, len, buf, message, write_size, NULL, lsn) UNIV_INTERN dberr_t @@ -996,7 +996,9 @@ _fil_io( operation for this page and if initialized we do not trim again if actual page size does not decrease. */ - trx_t* trx) + trx_t* trx, + lsn_t lsn) /* lsn of the newest modification */ + __attribute__((nonnull(8))); /**********************************************************************//** Waits for an aio operation to complete. This function is used to write the |