hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Johan Wikman
2017-04-19 18:19:13 +03:00
parent aa3559c6e9 7989473fbd
commit c3cfc86a7b
14 changed files with 121 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/maxscale/trxboundaryparser.hh
View File

@ -22,6 +22,10 @@ namespace maxscale
#define TBP_EXPECT_TOKEN(string_literal) string_literal, (sizeof(string_literal) - 1)
// For debugging purposes.
// #define TBP_LOG_UNEXPECTED_AND_EXHAUSTED
#undef TBP_LOG_UNEXPECTED_AND_EXHAUSTED
/**
* @class TrxBoundaryParser
*
@ -149,7 +153,7 @@ private:
void log_unexpected()
{
#ifdef SS_DEBUG
#ifdef TBP_LOG_UNEXPECTED_AND_EXHAUSTED
MXS_NOTICE("Transaction tracking: In statement '%.*s', unexpected token at '%.*s'.",
(int)m_len, m_pSql, (int)(m_pEnd - m_pI), m_pI);
#endif
@ -157,7 +161,7 @@ private:
void log_exhausted()
{
#ifdef SS_DEBUG
#ifdef TBP_LOG_UNEXPECTED_AND_EXHAUSTED
MXS_NOTICE("Transaction tracking: More tokens expected in statement '%.*s'.", (int)m_len, m_pSql);
#endif
}