mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-36753 Assertion `str[strlen(str)-1] != '\n'' failed in my_message_sql upon REPAIR .. USE_FRM with encryption enabled

Browse source 
remove '\n' from error log messages
This commit is contained in:
Sergei Golubchik 2025-05-07 16:17:37 +02:00
commit 9306353d2d
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysys/charset.c
View file

@ -552,7 +552,7 @@ my_read_charset_file(MY_CHARSET_LOADER *loader,
if (my_parse_charset_xml(loader, (char *) buf, len))
{
my_printf_error(EE_UNKNOWN_CHARSET, "Error while parsing '%s': %s\n",
my_printf_error(EE_UNKNOWN_CHARSET, "Error while parsing '%s': %s",
MYF(0), filename, loader->error);
goto error;
}

6
storage/maria/ma_crypt.c
View file

@ -166,7 +166,7 @@ ma_crypt_read(MARIA_SHARE* share, uchar *buff, my_bool silent)
iv_length != sizeof(((MARIA_CRYPT_DATA*)1)->scheme.iv) + 4)
{
my_printf_error(HA_ERR_UNSUPPORTED,
"Unsupported crypt scheme type: %d iv_length: %d\n",
"Unsupported crypt scheme type: %d iv_length: %d",
MYF(ME_ERROR_LOG | (silent ? ME_WARNING : ME_FATAL)),
type, iv_length);
return 0;
@ -511,7 +511,7 @@ static int ma_encrypt(MARIA_SHARE *share, MARIA_CRYPT_DATA *crypt_data,
{
my_errno= HA_ERR_DECRYPTION_FAILED;
my_printf_error(HA_ERR_DECRYPTION_FAILED,
"failed to encrypt '%s' rc: %d dstlen: %u size: %u\n",
"failed to encrypt '%s' rc: %d dstlen: %u size: %u",
MYF(ME_FATAL|ME_ERROR_LOG),
share->open_file_name.str, rc, dstlen, size);
return 1;
@ -539,7 +539,7 @@ static int ma_decrypt(MARIA_SHARE *share, MARIA_CRYPT_DATA *crypt_data,
my_errno= HA_ERR_DECRYPTION_FAILED;
if (!share->silence_encryption_errors)
my_printf_error(HA_ERR_DECRYPTION_FAILED,
"failed to decrypt '%s' rc: %d dstlen: %u size: %u\n",
"failed to decrypt '%s' rc: %d dstlen: %u size: %u",
MYF(ME_FATAL|ME_ERROR_LOG),
share->open_file_name.str, rc, dstlen, size);
return 1;

9
tpool/aio_liburing.cc
View file

@ -60,7 +60,10 @@ public:
case EPERM:
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_queue_init() failed with EPERM:"
" 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).",
" 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).",
ME_ERROR_LOG | ME_WARNING);
break;
default:
@ -93,7 +96,7 @@ public:
{
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_submit() returned %d during shutdown:"
" this may cause a hang\n",
" this may cause a hang",
ME_ERROR_LOG | ME_FATAL, ret);
abort();
}
@ -152,7 +155,7 @@ private:
if (ret == -EINTR)
continue;
my_printf_error(ER_UNKNOWN_ERROR,
"io_uring_wait_cqe() returned %d\n",
"io_uring_wait_cqe() returned %d",
ME_ERROR_LOG | ME_FATAL, ret);
abort();
}