diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
commit | 4a0b56f60436cab3f2f60b15ec699cb19c1e10ba (patch) | |
tree | 141f7f177748f763dab14484514453cec367c585 /extra | |
parent | 0bf843cd13981b03920bfc49c646b28a130f5d47 (diff) | |
parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
download | mariadb-git-4a0b56f60436cab3f2f60b15ec699cb19c1e10ba.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'extra')
-rw-r--r-- | extra/comp_err.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index 52353ac9eea..6fe26c4e4be 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -788,6 +788,7 @@ static ha_checksum checksum_format_specifier(const char* msg) case 'x': case 's': case 'M': + case 'T': start= 0; /* Not in format specifier anymore */ break; } |