mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
removed 2 small useless if().
sql/log.cc: a comment for the future. sql/mysqld.cc: if (p) is not needed: fn_ext() always returns a valid pointed; the way to test if an extension was found is if (*p), not if (p). But here even if there's no extension, we still want to truncate opt_name to FN_REFLEN, so we always execute the code. By design, the test was always 'false' (because we strip the extension before testing if there's an extension) so log->set_no_rotate never executed. sql/sql_class.h: remove set_no_rotate as we don't need it.
This commit is contained in:
parent
d974959b4f
commit
543208de96
3 changed files with 11 additions and 10 deletions
|
|
@ -1089,7 +1089,14 @@ bool MYSQL_LOG::write(Log_event* event_info)
|
|||
#endif
|
||||
if ((thd && !(thd->options & OPTION_BIN_LOG) &&
|
||||
(thd->master_access & SUPER_ACL)) ||
|
||||
(local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db)))
|
||||
(local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db))
|
||||
/*
|
||||
This is the place for future tests like "do the involved tables match
|
||||
(to be implemented) binlog_[wild_]{do|ignore}_table?" (WL#1049):
|
||||
we will add a
|
||||
&& ... to the if().
|
||||
*/
|
||||
)
|
||||
{
|
||||
VOID(pthread_mutex_unlock(&LOCK_log));
|
||||
DBUG_PRINT("error",("!db_ok"));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue