mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log):
Filter out replication general_log and slow_log entirely from binary log. Caching result of table share-specific tests.
This commit is contained in:
@ -3144,8 +3144,8 @@ end_with_restore_list:
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
thd->clear_error(); // No binlog error generated
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
|
||||
mysql_bin_log.write(&qinfo);
|
||||
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
||||
thd->query, thd->query_length, 0, FALSE);
|
||||
}
|
||||
}
|
||||
select_lex->table_list.first= (byte*) first_table;
|
||||
@ -3178,8 +3178,8 @@ end_with_restore_list:
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
thd->clear_error(); // No binlog error generated
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
|
||||
mysql_bin_log.write(&qinfo);
|
||||
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
||||
thd->query, thd->query_length, 0, FALSE);
|
||||
}
|
||||
}
|
||||
select_lex->table_list.first= (byte*) first_table;
|
||||
@ -3203,8 +3203,8 @@ end_with_restore_list:
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
thd->clear_error(); // No binlog error generated
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
|
||||
mysql_bin_log.write(&qinfo);
|
||||
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
||||
thd->query, thd->query_length, 0, FALSE);
|
||||
}
|
||||
}
|
||||
select_lex->table_list.first= (byte*) first_table;
|
||||
@ -3861,10 +3861,8 @@ end_with_restore_list:
|
||||
if (!(res= mysql_create_user(thd, lex->users_list)))
|
||||
{
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
thd->binlog_query(THD::MYSQL_QUERY_TYPE,
|
||||
thd->query, thd->query_length, FALSE, FALSE);
|
||||
}
|
||||
send_ok(thd);
|
||||
}
|
||||
break;
|
||||
@ -4054,8 +4052,8 @@ end_with_restore_list:
|
||||
{
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
|
||||
mysql_bin_log.write(&qinfo);
|
||||
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
||||
thd->query, thd->query_length, 0, FALSE);
|
||||
}
|
||||
}
|
||||
send_ok(thd);
|
||||
|
Reference in New Issue
Block a user