Commit 1f2ff25e authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fixed embedded server.

parent effb65bc
...@@ -38,6 +38,9 @@ static void trans_track_end_trx(THD *thd) ...@@ -38,6 +38,9 @@ static void trans_track_end_trx(THD *thd)
thd->session_tracker.get_tracker(TRANSACTION_INFO_TRACKER))->end_trx(thd); thd->session_tracker.get_tracker(TRANSACTION_INFO_TRACKER))->end_trx(thd);
} }
} }
#else
#define trans_track_end_trx(A) do{}while(0)
#endif //EMBEDDED_LIBRARY
/** /**
...@@ -46,6 +49,7 @@ static void trans_track_end_trx(THD *thd) ...@@ -46,6 +49,7 @@ static void trans_track_end_trx(THD *thd)
*/ */
void trans_reset_one_shot_chistics(THD *thd) void trans_reset_one_shot_chistics(THD *thd)
{ {
#ifndef EMBEDDED_LIBRARY
if (thd->variables.session_track_transaction_info > TX_TRACK_NONE) if (thd->variables.session_track_transaction_info > TX_TRACK_NONE)
{ {
Transaction_state_tracker *tst= (Transaction_state_tracker *) Transaction_state_tracker *tst= (Transaction_state_tracker *)
...@@ -54,13 +58,10 @@ void trans_reset_one_shot_chistics(THD *thd) ...@@ -54,13 +58,10 @@ void trans_reset_one_shot_chistics(THD *thd)
tst->set_read_flags(thd, TX_READ_INHERIT); tst->set_read_flags(thd, TX_READ_INHERIT);
tst->set_isol_level(thd, TX_ISOL_INHERIT); tst->set_isol_level(thd, TX_ISOL_INHERIT);
} }
#endif //EMBEDDED_LIBRARY
thd->tx_isolation= (enum_tx_isolation) thd->variables.tx_isolation; thd->tx_isolation= (enum_tx_isolation) thd->variables.tx_isolation;
thd->tx_read_only= thd->variables.tx_read_only; thd->tx_read_only= thd->variables.tx_read_only;
} }
#else
#define trans_track_end_trx(A) do{}while(0)
#endif //EMBEDDED_LIBRARY
/* Conditions under which the transaction state must not change. */ /* Conditions under which the transaction state must not change. */
static bool trans_check(THD *thd) static bool trans_check(THD *thd)
......
...@@ -44,10 +44,6 @@ bool trans_xa_prepare(THD *thd); ...@@ -44,10 +44,6 @@ bool trans_xa_prepare(THD *thd);
bool trans_xa_commit(THD *thd); bool trans_xa_commit(THD *thd);
bool trans_xa_rollback(THD *thd); bool trans_xa_rollback(THD *thd);
#ifndef EMBEDDED_LIBRARY
void trans_reset_one_shot_chistics(THD *thd); void trans_reset_one_shot_chistics(THD *thd);
#else
#define trans_reset_one_shot_chistics(A) do{}while(0)
#endif //EMBEDDED_LIBRARY
#endif /* TRANSACTION_H */ #endif /* TRANSACTION_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment