1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix new innodb warnings to use the standard innodb warning syntax

Browse Source
This commit is contained in:
Sergei Golubchik 2015-03-01 16:53:16 +01:00
parent c78f594bbc
commit c3f80a2bff
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/log/log0crypt.cc
View File

@ -249,7 +249,7 @@ log_crypt_set_ver_and_key(
fprintf(stderr, "\nInnoDB redo log crypto: Can't initialize to key version %du\n", fprintf(stderr, "\nInnoDB 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;

6
storage/innobase/os/os0file.cc
View File

@ -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(
#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(
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);

2
storage/xtradb/log/log0crypt.cc
View File

@ -250,7 +250,7 @@ log_crypt_set_ver_and_key(
fprintf(stderr, "\nInnoDB redo log crypto: Can't initialize to key version %du\n", fprintf(stderr, "\nInnoDB 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;

6
storage/xtradb/os/os0file.cc
View File

@ -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(
#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(
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);