Skip to content

Commit 9306353

Browse files
committed
MDEV-36753 Assertion `str[strlen(str)-1] != '\n'' failed in my_message_sql upon REPAIR .. USE_FRM with encryption enabled
remove '\n' from error log messages
1 parent 0b16d78 commit 9306353

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

mysys/charset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ my_read_charset_file(MY_CHARSET_LOADER *loader,
552552

553553
if (my_parse_charset_xml(loader, (char *) buf, len))
554554
{
555-
my_printf_error(EE_UNKNOWN_CHARSET, "Error while parsing '%s': %s\n",
555+
my_printf_error(EE_UNKNOWN_CHARSET, "Error while parsing '%s': %s",
556556
MYF(0), filename, loader->error);
557557
goto error;
558558
}

storage/maria/ma_crypt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ ma_crypt_read(MARIA_SHARE* share, uchar *buff, my_bool silent)
166166
iv_length != sizeof(((MARIA_CRYPT_DATA*)1)->scheme.iv) + 4)
167167
{
168168
my_printf_error(HA_ERR_UNSUPPORTED,
169-
"Unsupported crypt scheme type: %d iv_length: %d\n",
169+
"Unsupported crypt scheme type: %d iv_length: %d",
170170
MYF(ME_ERROR_LOG | (silent ? ME_WARNING : ME_FATAL)),
171171
type, iv_length);
172172
return 0;
@@ -511,7 +511,7 @@ static int ma_encrypt(MARIA_SHARE *share, MARIA_CRYPT_DATA *crypt_data,
511511
{
512512
my_errno= HA_ERR_DECRYPTION_FAILED;
513513
my_printf_error(HA_ERR_DECRYPTION_FAILED,
514-
"failed to encrypt '%s' rc: %d dstlen: %u size: %u\n",
514+
"failed to encrypt '%s' rc: %d dstlen: %u size: %u",
515515
MYF(ME_FATAL|ME_ERROR_LOG),
516516
share->open_file_name.str, rc, dstlen, size);
517517
return 1;
@@ -539,7 +539,7 @@ static int ma_decrypt(MARIA_SHARE *share, MARIA_CRYPT_DATA *crypt_data,
539539
my_errno= HA_ERR_DECRYPTION_FAILED;
540540
if (!share->silence_encryption_errors)
541541
my_printf_error(HA_ERR_DECRYPTION_FAILED,
542-
"failed to decrypt '%s' rc: %d dstlen: %u size: %u\n",
542+
"failed to decrypt '%s' rc: %d dstlen: %u size: %u",
543543
MYF(ME_FATAL|ME_ERROR_LOG),
544544
share->open_file_name.str, rc, dstlen, size);
545545
return 1;

tpool/aio_liburing.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ class aio_uring final : public tpool::aio
6060
case EPERM:
6161
my_printf_error(ER_UNKNOWN_ERROR,
6262
"io_uring_queue_init() failed with EPERM:"
63-
" sysctl kernel.io_uring_disabled has the value 2, or 1 and the user of the process is not a member of sysctl kernel.io_uring_group. (see man 2 io_uring_setup).",
63+
" sysctl kernel.io_uring_disabled has the value 2, "
64+
"or 1 and the user of the process is not a member of "
65+
"sysctl kernel.io_uring_group. (see man 2 "
66+
"io_uring_setup).",
6467
ME_ERROR_LOG | ME_WARNING);
6568
break;
6669
default:
@@ -93,7 +96,7 @@ class aio_uring final : public tpool::aio
9396
{
9497
my_printf_error(ER_UNKNOWN_ERROR,
9598
"io_uring_submit() returned %d during shutdown:"
96-
" this may cause a hang\n",
99+
" this may cause a hang",
97100
ME_ERROR_LOG | ME_FATAL, ret);
98101
abort();
99102
}
@@ -152,7 +155,7 @@ class aio_uring final : public tpool::aio
152155
if (ret == -EINTR)
153156
continue;
154157
my_printf_error(ER_UNKNOWN_ERROR,
155-
"io_uring_wait_cqe() returned %d\n",
158+
"io_uring_wait_cqe() returned %d",
156159
ME_ERROR_LOG | ME_FATAL, ret);
157160
abort();
158161
}

0 commit comments

Comments
 (0)