Merge branch '2.3' into develop
This commit is contained in:
@ -938,6 +938,11 @@ void session_set_retain_last_statements(uint32_t n)
|
||||
this_unit.retain_last_statements = n;
|
||||
}
|
||||
|
||||
uint32_t session_get_retain_last_statements()
|
||||
{
|
||||
return this_unit.retain_last_statements;
|
||||
}
|
||||
|
||||
void session_set_dump_statements(session_dump_statements_t value)
|
||||
{
|
||||
this_unit.dump_statements = value;
|
||||
@ -948,6 +953,25 @@ session_dump_statements_t session_get_dump_statements()
|
||||
return this_unit.dump_statements;
|
||||
}
|
||||
|
||||
const char* session_get_dump_statements_str()
|
||||
{
|
||||
switch (this_unit.dump_statements)
|
||||
{
|
||||
case SESSION_DUMP_STATEMENTS_NEVER:
|
||||
return "never";
|
||||
|
||||
case SESSION_DUMP_STATEMENTS_ON_CLOSE:
|
||||
return "on_close";
|
||||
|
||||
case SESSION_DUMP_STATEMENTS_ON_ERROR:
|
||||
return "on_error";
|
||||
|
||||
default:
|
||||
mxb_assert(!true);
|
||||
return "unknown";
|
||||
}
|
||||
}
|
||||
|
||||
void session_retain_statement(MXS_SESSION* pSession, GWBUF* pBuffer)
|
||||
{
|
||||
static_cast<Session*>(pSession)->retain_statement(pBuffer);
|
||||
@ -1380,7 +1404,7 @@ void Session::retain_statement(GWBUF* pBuffer)
|
||||
{
|
||||
mxb_assert(m_last_queries.size() <= m_retain_last_statements);
|
||||
|
||||
std::shared_ptr<GWBUF> sBuffer(gwbuf_clone(pBuffer));
|
||||
std::shared_ptr<GWBUF> sBuffer(gwbuf_clone(pBuffer), std::default_delete<GWBUF>());
|
||||
|
||||
m_last_queries.push_front(QueryInfo(sBuffer));
|
||||
|
||||
|
Reference in New Issue
Block a user