summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2023-01-10 21:04:17 +0100
committerSergei Golubchik <serg@mariadb.org>2023-01-10 21:04:17 +0100
commitfdcfc251271c2c0d29d77c7fe7cee356f16f2db5 (patch)
tree4665f47d2da9c38db37dfd630199b142ec5ccc08 /sql/sp_head.cc
parent6cb84346e1bde63ec79dd5e3a7d80f69bb106ead (diff)
parent56948ee54c9d113f07f725ebdc560d1919fc6676 (diff)
downloadmariadb-git-fdcfc251271c2c0d29d77c7fe7cee356f16f2db5.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index b7e3680f704..8801d8880b1 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2332,7 +2332,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
Disable slow log if:
- Slow logging is enabled (no change needed)
- This is a normal SP (not event log)
- - If we have not explicitely disabled logging of SP
+ - If we have not explicitly disabled logging of SP
*/
if (save_enable_slow_log &&
((!(m_flags & LOG_SLOW_STATEMENTS) &&
@@ -2346,7 +2346,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
Disable general log if:
- If general log is enabled (no change needed)
- This is a normal SP (not event log)
- - If we have not explicitely disabled logging of SP
+ - If we have not explicitly disabled logging of SP
*/
if (!(thd->variables.option_bits & OPTION_LOG_OFF) &&
(!(m_flags & LOG_GENERAL_LOG) &&