diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-16 11:13:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-16 11:13:08 +0100 |
| commit | cf013ff949a5e05d678bdc3a37c56538fcab4a20 (patch) | |
| tree | 9f2cd15d2d52deaf38321e2cc45a176370186ba0 /storage/xtradb/include/btr0cur.h | |
| parent | 4ce53556ce5f31ec6b811c0803285cf0c29f4540 (diff) | |
| parent | 37a5a54a01ab00fb334c89b6ed5e7dc6cef22fe5 (diff) | |
| download | mariadb-git-cf013ff949a5e05d678bdc3a37c56538fcab4a20.tar.gz | |
xtradb merge. Percona-Server-5.5.28-rel29.3
Diffstat (limited to 'storage/xtradb/include/btr0cur.h')
| -rw-r--r-- | storage/xtradb/include/btr0cur.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/include/btr0cur.h b/storage/xtradb/include/btr0cur.h index cbc6103c2ee..cb44129aeb5 100644 --- a/storage/xtradb/include/btr0cur.h +++ b/storage/xtradb/include/btr0cur.h @@ -259,8 +259,9 @@ btr_cur_update_alloc_zip( ulint length, /*!< in: size needed */ ibool create, /*!< in: TRUE=delete-and-insert, FALSE=update-in-place */ - mtr_t* mtr) /*!< in: mini-transaction */ - __attribute__((nonnull, warn_unused_result)); + mtr_t* mtr, /*!< in: mini-transaction */ + trx_t* trx) /*!< in: NULL or transaction */ + __attribute__((nonnull (1, 2, 3, 6), warn_unused_result)); /*************************************************************//** Updates a record when the update causes no size changes in its fields. @return DB_SUCCESS or error number */ |