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

print binlog unsafe errors at log_warnings level 1, not 2.

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-18 15:24:30 +02:00
parent 8286bcd721
commit 152f1cd086
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
View File

@@ -67,7 +67,7 @@ DROP TABLE t1;
SET GLOBAL log_warnings = @old_log_warnings; SET GLOBAL log_warnings = @old_log_warnings;
# Count the number of times the "Unsafe" message was printed # Count the number of times the "Unsafe" message was printed
# to the error log. # to the error log.
Occurrences: 0 Occurrences: 1
create table t1 (n1 int, n2 int, n3 int, create table t1 (n1 int, n2 int, n3 int,
key (n1, n2, n3), key (n1, n2, n3),
key (n2, n3, n1), key (n2, n3, n1),

2
sql/sql_class.cc
View File

@@ -6145,7 +6145,7 @@ void THD::issue_unsafe_warnings()
ER_BINLOG_UNSAFE_STATEMENT, ER_BINLOG_UNSAFE_STATEMENT,
ER(ER_BINLOG_UNSAFE_STATEMENT), ER(ER_BINLOG_UNSAFE_STATEMENT),
ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type])); ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));
if (global_system_variables.log_warnings > 1 && if (global_system_variables.log_warnings > 0 &&
!protect_against_unsafe_warning_flood(unsafe_type)) !protect_against_unsafe_warning_flood(unsafe_type))
print_unsafe_warning_to_log(unsafe_type, buf, query()); print_unsafe_warning_to_log(unsafe_type, buf, query());
} }