diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:43:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:43:59 +0200 |
| commit | 0bc42602266815b81fe86b08c2228912c1a95340 (patch) | |
| tree | 7379577fac279387ec64d9ec0d752db11b0e425c /sql/sql_parse.cc | |
| parent | 7225bef7275da77faab316b863da0f4f5bf24a8f (diff) | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| download | mariadb-git-0bc42602266815b81fe86b08c2228912c1a95340.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 87ac04ea0ba..6e7b1d07073 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2008, 2019, MariaDB Corporation. + Copyright (c) 2008, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3864,8 +3864,10 @@ mysql_execute_command(THD *thd) else { WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_SHOW); +# ifdef ENABLED_PROFILING if (lex->sql_command == SQLCOM_SHOW_PROFILE) thd->profiling.discard_current_query(); +# endif } #endif /* WITH_WSREP */ @@ -6725,7 +6727,7 @@ static bool check_rename_table(THD *thd, TABLE_LIST *first_table, 0, 0)) return 1; - /* check if these are refering to temporary tables */ + /* check if these are referring to temporary tables */ table->table= find_temporary_table_for_rename(thd, first_table, table); table->next_local->table= table->table; |