diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
| commit | 3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (patch) | |
| tree | cefa82212b688d12a7ca180f7a0a8f32715e2a79 /storage/connect/filamdbf.cpp | |
| parent | 16327fc2e76e9215059894b461e8aca7f989da00 (diff) | |
| parent | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (diff) | |
| download | mariadb-git-3f9040085a0de4976f55bc7e4a2fa5fa8d923100.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev17096
Diffstat (limited to 'storage/connect/filamdbf.cpp')
| -rw-r--r-- | storage/connect/filamdbf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/filamdbf.cpp b/storage/connect/filamdbf.cpp index 893e3da0d46..c8bab2b53a4 100644 --- a/storage/connect/filamdbf.cpp +++ b/storage/connect/filamdbf.cpp @@ -447,7 +447,7 @@ int DBFFAM::Cardinality(PGLOBAL g) if (rln && Lrecl != rln) { // This happens always on some Linux platforms - sprintf(g->Message, MSG(BAD_LRECL), Lrecl, rln); + sprintf(g->Message, MSG(BAD_LRECL), Lrecl, (ushort)rln); if (Accept) { Lrecl = rln; @@ -967,7 +967,7 @@ int DBMFAM::Cardinality(PGLOBAL g) if (rln && Lrecl != rln) { // This happens always on some Linux platforms - sprintf(g->Message, MSG(BAD_LRECL), Lrecl, rln); + sprintf(g->Message, MSG(BAD_LRECL), Lrecl, (ushort)rln); if (Accept) { Lrecl = rln; |