diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-26 19:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-26 19:21:19 +0200 |
| commit | f42e08f951642850b1b9e3c2858325d21b260223 (patch) | |
| tree | 672195393e56b4e12b4802ad042e957ef46fde7c /storage/xtradb/trx | |
| parent | 8c35f105d24a71fb34b83e38ed57ed02338be415 (diff) | |
| parent | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (diff) | |
| download | mariadb-git-f42e08f951642850b1b9e3c2858325d21b260223.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'storage/xtradb/trx')
| -rw-r--r-- | storage/xtradb/trx/trx0trx.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/trx/trx0trx.cc b/storage/xtradb/trx/trx0trx.cc index d0cb4a883cc..1d2f7ada54e 100644 --- a/storage/xtradb/trx/trx0trx.cc +++ b/storage/xtradb/trx/trx0trx.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2015, 2017, 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 @@ -2283,6 +2284,7 @@ state_ok: } } #endif /* WITH_WSREP */ + /**********************************************************************//** Prints info about a transaction. Acquires and releases lock_sys->mutex and trx_sys->mutex. */ @@ -2744,4 +2746,3 @@ trx_start_for_ddl_low( ut_error; } - |