diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-05 00:59:57 +0200 |
| commit | 83da1a1e572d67588b66724b34fdb7f07963e80f (patch) | |
| tree | 54af19c1da875cdaa71c3c94a42fd6dfc53e97ad /storage/xtradb/include/trx0trx.h | |
| parent | f4806772d3578fee7fd03dd96f91d59b0269830e (diff) | |
| parent | 8d69ce7b821a88b5ba8749a08489839050283a63 (diff) | |
| download | mariadb-git-83da1a1e572d67588b66724b34fdb7f07963e80f.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/include/trx0trx.h')
| -rw-r--r-- | storage/xtradb/include/trx0trx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/include/trx0trx.h b/storage/xtradb/include/trx0trx.h index 84817c9645a..44f49d47b4d 100644 --- a/storage/xtradb/include/trx0trx.h +++ b/storage/xtradb/include/trx0trx.h @@ -106,7 +106,7 @@ void trx_free_prepared( /*==============*/ trx_t* trx) /*!< in, own: trx object */ - UNIV_COLD MY_ATTRIBUTE((nonnull)); + UNIV_COLD; /********************************************************************//** Frees a transaction object for MySQL. */ UNIV_INTERN |