From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 25 Apr 2011 17:22:25 +0200 Subject: lots of post-merge changes --- storage/federatedx/federatedx_txn.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'storage/federatedx/federatedx_txn.cc') diff --git a/storage/federatedx/federatedx_txn.cc b/storage/federatedx/federatedx_txn.cc index a6ca3acc744..84c7cd50e8d 100644 --- a/storage/federatedx/federatedx_txn.cc +++ b/storage/federatedx/federatedx_txn.cc @@ -26,19 +26,19 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef USE_PRAGMA_IMPLEMENTATION +#pragma implementation // gcc: Class implementation +#endif -/*#define MYSQL_SERVER 1*/ -#include "mysql_priv.h" +#define MYSQL_SERVER 1 +#include "sql_priv.h" #include #include "ha_federatedx.h" #include "m_string.h" - -#ifdef USE_PRAGMA_IMPLEMENTATION -#pragma implementation // gcc: Class implementation -#endif - +#include "table.h" +#include "sql_servers.h" federatedx_txn::federatedx_txn() : txn_list(0), savepoint_level(0), savepoint_stmt(0), savepoint_next(0) -- cgit v1.2.1