database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-27 10:43:00 +03:00
parent 6948abb94c 638afc4acf
commit 133c2129cd
301 changed files with 9772 additions and 8644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log.cc
View File

@@ -1700,13 +1700,9 @@ bool Log_to_csv_event_handler::init()
return 0;
}
int LOGGER::set_handlers(ulonglong error_log_printer,
ulonglong slow_log_printer,
int LOGGER::set_handlers(ulonglong slow_log_printer,
ulonglong general_log_printer)
{
/* error log table is not supported yet */
DBUG_ASSERT(error_log_printer < LOG_TABLE);
lock_exclusive();
if ((slow_log_printer & LOG_TABLE || general_log_printer & LOG_TABLE) &&
@@ -1719,7 +1715,6 @@ int LOGGER::set_handlers(ulonglong error_log_printer,
"Falling back to the old-fashioned logs");
}
init_error_log(error_log_printer);
init_slow_log(slow_log_printer);
init_general_log(general_log_printer);