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
c3f80a2b
Commit
c3f80a2b
authored
Mar 01, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix new innodb warnings to use the standard innodb warning syntax
parent
c78f594b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
storage/innobase/log/log0crypt.cc
storage/innobase/log/log0crypt.cc
+1
-1
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+3
-3
storage/xtradb/log/log0crypt.cc
storage/xtradb/log/log0crypt.cc
+1
-1
storage/xtradb/os/os0file.cc
storage/xtradb/os/os0file.cc
+3
-3
No files found.
storage/innobase/log/log0crypt.cc
View file @
c3f80a2b
...
@@ -249,7 +249,7 @@ log_crypt_set_ver_and_key(
...
@@ -249,7 +249,7 @@ log_crypt_set_ver_and_key(
fprintf
(
stderr
,
"
\n
InnoDB redo log crypto: Can't initialize to key version %du
\n
"
,
fprintf
(
stderr
,
"
\n
InnoDB redo log crypto: Can't initialize to key version %du
\n
"
,
key_ver
);
key_ver
);
fprintf
(
stderr
,
"InnoDB:
[Warning]
Disabling redo log encryption
\n
"
);
fprintf
(
stderr
,
"InnoDB:
Warning:
Disabling redo log encryption
\n
"
);
srv_encrypt_log
=
FALSE
;
srv_encrypt_log
=
FALSE
;
}
else
{
}
else
{
key_ver
=
vkey
;
key_ver
=
vkey
;
...
...
storage/innobase/os/os0file.cc
View file @
c3f80a2b
...
@@ -6536,7 +6536,7 @@ os_file_trim(
...
@@ -6536,7 +6536,7 @@ os_file_trim(
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate call failed with error code %d.
\n
"
" InnoDB:
Warning:
fallocate call failed with error code %d.
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: Disabling fallocate for now.
\n
"
,
errno
,
off
,
trim_len
,
len
);
" InnoDB: Disabling fallocate for now.
\n
"
,
errno
,
off
,
trim_len
,
len
);
...
@@ -6557,7 +6557,7 @@ os_file_trim(
...
@@ -6557,7 +6557,7 @@ os_file_trim(
#else
#else
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate not supported on this installation."
" InnoDB:
Warning:
fallocate not supported on this installation."
" InnoDB: Disabling fallocate for now."
);
" InnoDB: Disabling fallocate for now."
);
os_fallocate_failed
=
TRUE
;
os_fallocate_failed
=
TRUE
;
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
...
@@ -6583,7 +6583,7 @@ os_file_trim(
...
@@ -6583,7 +6583,7 @@ os_file_trim(
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate call failed with error.
\n
"
" InnoDB:
Warning:
fallocate call failed with error.
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: Disabling fallocate for now.
\n
"
,
off
,
trim_len
,
len
);
" InnoDB: Disabling fallocate for now.
\n
"
,
off
,
trim_len
,
len
);
...
...
storage/xtradb/log/log0crypt.cc
View file @
c3f80a2b
...
@@ -250,7 +250,7 @@ log_crypt_set_ver_and_key(
...
@@ -250,7 +250,7 @@ log_crypt_set_ver_and_key(
fprintf
(
stderr
,
"
\n
InnoDB redo log crypto: Can't initialize to key version %du
\n
"
,
fprintf
(
stderr
,
"
\n
InnoDB redo log crypto: Can't initialize to key version %du
\n
"
,
key_ver
);
key_ver
);
fprintf
(
stderr
,
"InnoDB:
[Warning]
Disabling redo log encryption
\n
"
);
fprintf
(
stderr
,
"InnoDB:
Warning:
Disabling redo log encryption
\n
"
);
srv_encrypt_log
=
FALSE
;
srv_encrypt_log
=
FALSE
;
}
else
{
}
else
{
key_ver
=
vkey
;
key_ver
=
vkey
;
...
...
storage/xtradb/os/os0file.cc
View file @
c3f80a2b
...
@@ -6622,7 +6622,7 @@ os_file_trim(
...
@@ -6622,7 +6622,7 @@ os_file_trim(
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate call failed with error code %d.
\n
"
" InnoDB:
Warning:
fallocate call failed with error code %d.
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: Disabling fallocate for now.
\n
"
,
errno
,
off
,
trim_len
,
len
);
" InnoDB: Disabling fallocate for now.
\n
"
,
errno
,
off
,
trim_len
,
len
);
...
@@ -6643,7 +6643,7 @@ os_file_trim(
...
@@ -6643,7 +6643,7 @@ os_file_trim(
#else
#else
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate not supported on this installation."
" InnoDB:
Warning:
fallocate not supported on this installation."
" InnoDB: Disabling fallocate for now."
);
" InnoDB: Disabling fallocate for now."
);
os_fallocate_failed
=
TRUE
;
os_fallocate_failed
=
TRUE
;
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
...
@@ -6669,7 +6669,7 @@ os_file_trim(
...
@@ -6669,7 +6669,7 @@ os_file_trim(
srv_use_trim
=
FALSE
;
srv_use_trim
=
FALSE
;
ut_print_timestamp
(
stderr
);
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
fprintf
(
stderr
,
" InnoDB:
[Warning]
fallocate call failed with error.
\n
"
" InnoDB:
Warning:
fallocate call failed with error.
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: start: %lu len: %lu payload: %lu
\n
"
" InnoDB: Disabling fallocate for now.
\n
"
,
off
,
trim_len
,
len
);
" InnoDB: Disabling fallocate for now.
\n
"
,
off
,
trim_len
,
len
);
...
...
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