Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
152f1cd0
Commit
152f1cd0
authored
Sep 18, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
print binlog unsafe errors at log_warnings level 1, not 2.
parent
8286bcd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
+1
-1
sql/sql_class.cc
sql/sql_class.cc
+1
-1
No files found.
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
View file @
152f1cd0
...
@@ -67,7 +67,7 @@ DROP TABLE t1;
...
@@ -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),
...
...
sql/sql_class.cc
View file @
152f1cd0
...
@@ -6145,7 +6145,7 @@ void THD::issue_unsafe_warnings()
...
@@ -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
());
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment