Merge pull request #226 from 0xAX/profile-must-be-enabled

Call profiling.restart() and profiling.reset() only if profiling is e…
This commit is contained in:
Sergey Vojtovich 2016-08-27 08:33:46 +04:00 committed by GitHub
commit 1fd8b0a595

View file

@ -1661,7 +1661,9 @@ void THD::free_connection()
/* close all prepared statements, to save memory */
stmt_map.reset();
free_connection_done= 1;
#if defined(ENABLED_PROFILING)
profiling.restart(); // Reset profiling
#endif
}
/*
@ -1686,7 +1688,9 @@ void THD::reset_for_reuse()
abort_on_warning= 0;
free_connection_done= 0;
m_command= COM_CONNECT;
#if defined(ENABLED_PROFILING)
profiling.reset();
#endif
#ifdef SIGNAL_WITH_VIO_CLOSE
active_vio = 0;
#endif