summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-04-21 17:46:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-04-21 17:46:40 +0300
commitfae0ccad6ec391bf85c39070f784589d48e11951 (patch)
treeb6a20ffe8c11a13edce1f0c7c46eb9c5ac3d2bab /sql/log.h
parent1b558dd462d34e948f3a4d9e54af973e37a9746e (diff)
parent620c55e708b9ea94ef8ba309267a6f2f32ed8104 (diff)
downloadmariadb-git-fae0ccad6ec391bf85c39070f784589d48e11951.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/log.h b/sql/log.h
index b55ed0f31f6..964b0dcfef7 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -1115,8 +1115,7 @@ public:
const char *query, size_t query_length);
/* we use this function to setup all enabled log event handlers */
- int set_handlers(ulonglong error_log_printer,
- ulonglong slow_log_printer,
+ int set_handlers(ulonglong slow_log_printer,
ulonglong general_log_printer);
void init_error_log(ulonglong error_log_printer);
void init_slow_log(ulonglong slow_log_printer);