diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
| commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
| tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /sql/sql_parse.cc | |
| parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
| parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
| download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz | |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2b8ea9265de..0a1a359e337 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, 2022, MariaDB + Copyright (c) 2008, 2023, 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 @@ -2513,7 +2513,7 @@ void log_slow_statement(THD *thd) if ((thd->server_status & (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) && !(thd->query_plan_flags & QPLAN_STATUS) && - !slow_filter_masked(thd, QPLAN_NOT_USING_INDEX)) + (thd->variables.log_slow_filter & QPLAN_NOT_USING_INDEX)) { thd->query_plan_flags|= QPLAN_NOT_USING_INDEX; /* We are always logging no index queries if enabled in filter */ @@ -2798,9 +2798,10 @@ bool sp_process_definer(THD *thd) } else { - LEX_USER *d= lex->definer= get_current_user(thd, lex->definer); + LEX_USER *d= get_current_user(thd, lex->definer); if (!d) DBUG_RETURN(TRUE); + thd->change_item_tree((Item**)&lex->definer, (Item*)d); /* If the specified definer differs from the current user or role, we |