diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /storage/federatedx/federatedx_txn.cc | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'storage/federatedx/federatedx_txn.cc')
| -rw-r--r-- | storage/federatedx/federatedx_txn.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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 <mysql/plugin.h> #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) |