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

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-03 03:06:42 +03:00
parent a6daa9ada0 3701208a2e
commit 056ac55aa0
756 changed files with 16223 additions and 15025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_profile.cc
View File

@ -338,7 +338,7 @@ void PROFILING::start_new_query(const char *initial_state)
finish_current_query();
}
enabled= (((thd)->options & OPTION_PROFILING) != 0);
enabled= ((thd->variables.option_bits & OPTION_PROFILING) != 0);
if (! enabled) DBUG_VOID_RETURN;
@ -376,7 +376,7 @@ void PROFILING::finish_current_query()
status_change("ending", NULL, NULL, 0);
if ((enabled) && /* ON at start? */
((thd->options & OPTION_PROFILING) != 0) && /* and ON at end? */
((thd->variables.option_bits & OPTION_PROFILING) != 0) && /* and ON at end? */
(current->query_source != NULL) &&
(! current->entries.is_empty()))
{