Commit c3f80a2b authored by Sergei Golubchik's avatar Sergei Golubchik

fix new innodb warnings to use the standard innodb warning syntax

parent c78f594b
...@@ -249,7 +249,7 @@ log_crypt_set_ver_and_key( ...@@ -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;
......
...@@ -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);
......
...@@ -250,7 +250,7 @@ log_crypt_set_ver_and_key( ...@@ -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;
......
...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment