diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 11:32:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 12:03:55 +0300 |
| commit | ea2bc974dce2ac509011807c80b36192cd18f686 (patch) | |
| tree | afbed3c29a2af90c44af2f086c6eb0d83c909840 /sql/sql_parse.cc | |
| parent | fbfb5b5f68a428ec819bc09d14b30cebf660b37b (diff) | |
| parent | 1ea266f3ef36e779d23697b18cb94e1b0f8e65ef (diff) | |
| download | mariadb-git-ea2bc974dce2ac509011807c80b36192cd18f686.tar.gz | |
Merge 10.1 into 10.2bb-10.2-merge
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index f1c9479adc7..66433d11d8f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -913,11 +913,6 @@ void execute_init_command(THD *thd, LEX_STRING *init_command, char *buf= thd->strmake(init_command->str, len); mysql_rwlock_unlock(var_lock); -#if defined(ENABLED_PROFILING) - thd->profiling.start_new_query(); - thd->profiling.set_query_source(buf, len); -#endif - THD_STAGE_INFO(thd, stage_execution_of_init_command); save_client_capabilities= thd->client_capabilities; thd->client_capabilities|= CLIENT_MULTI_QUERIES; @@ -932,9 +927,6 @@ void execute_init_command(THD *thd, LEX_STRING *init_command, thd->client_capabilities= save_client_capabilities; thd->net.vio= save_vio; -#if defined(ENABLED_PROFILING) - thd->profiling.finish_current_query(); -#endif } |