database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Call profiling.restart() and profiling.reset() only if profiling is enabled

Browse Source 
in other case we will get:

../alex/dev/server/sql/sql_class.cc: In member function ‘void THD::free_connection()’:
../server/sql/sql_class.cc:1664:3: error: ‘profiling’ was not declared in this scope
   profiling.restart();                          // Reset profiling
      ^~~~~~~~~

../server/sql/sql_class.cc: In member function ‘void THD::reset_for_reuse()’:
../server/sql/sql_class.cc:1689:3: error: ‘profiling’ was not declared in this scope
  profiling.reset();
       ^~~~~~~~~

errors.
This commit is contained in:
Alexander Kuleshov
2016-08-26 16:49:46 +06:00
parent 31a8cf54c8
commit e7f5443783
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

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