diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-06-15 15:27:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-06-15 15:27:11 +0400 |
| commit | 765347384af7fd3393ad37567a612d93ed8b3d92 (patch) | |
| tree | a2c0a08596142312ec38f33e4e02f353a2730fe1 /storage/innobase/include/trx0xa.h | |
| parent | 3b1921c714fcb4415cea9058408fb5a626e93b62 (diff) | |
| parent | e813fe862226554cfe31754b3dfeafbb2b9a7159 (diff) | |
| download | mariadb-git-765347384af7fd3393ad37567a612d93ed8b3d92.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'storage/innobase/include/trx0xa.h')
| -rw-r--r-- | storage/innobase/include/trx0xa.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/include/trx0xa.h b/storage/innobase/include/trx0xa.h index b333f32cd73..4d5adc68dcd 100644 --- a/storage/innobase/include/trx0xa.h +++ b/storage/innobase/include/trx0xa.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -24,12 +24,7 @@ this program; if not, write to the Free Software Foundation, Inc., #ifndef XA_H #define XA_H -/* Missing MySQL 5.7 header */ -#ifdef HAVE_XA_H -#include "xa.h" -#else #include "handler.h" -#endif /* * Transaction branch identification: XID and NULLXID: |