database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-12-25 09:13:28 +01:00
parent 0aa02567dd 043bd85a57
commit 478b83032b
112 changed files with 1838 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/plugutil.cpp
View File

@@ -378,9 +378,9 @@ char *PlugReadMessage(PGLOBAL g, int mid, char *m)
if (atoi(buff) == mid)
break;
if (sscanf(buff, " %*d %-.256s \"%[^\"]", msgid, stmsg) < 2) {
if (sscanf(buff, " %*d %.31s \"%.255[^\"]", msgid, stmsg) < 2) {
// Old message file
if (!sscanf(buff, " %*d \"%[^\"]", stmsg)) {
if (!sscanf(buff, " %*d \"%.255[^\"]", stmsg)) {
sprintf(stmsg, "Bad message file for %d %-.256s", mid, SVP(m));
goto fin;
} else