diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
commit | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (patch) | |
tree | 7f38ad7d6e69ea53fb9c887ff9aaa953f103ea54 /sql/sql_parse.cc | |
parent | 6d3747a294d75ab8153f82c5b2d61c3bf17b04de (diff) | |
parent | dba7e1e8e14254c9de61e74b7e68cdbbad0038a8 (diff) | |
download | mariadb-git-1df1a6392477ad211b2a66c6eccbe9d5c6316c7e.tar.gz |
Merge 10.2 into 10.3
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 58f9f7cc9d5..ead6235461e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -934,11 +934,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; @@ -953,9 +948,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 } |