summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2022-07-08 13:54:10 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2022-07-24 23:32:51 +0400
commit15eaa47b570c5b7d0d9fea64747b95ebf326bd7e (patch)
tree0daff31a1b73fc693ad4d1f83dfd435ab808bc2f
parentedc4ad0ecc45a1cf85ca93eceb41ffeef8050df4 (diff)
downloadmariadb-git-bb-10.4-mdev-27595-hf.tar.gz
Fix to quiet the compiler on Windows.bb-10.4-mdev-27595-hf
-rw-r--r--sql/sql_prepare.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 77c8ccf8031..575953ebdf2 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -5500,7 +5500,8 @@ static char *dup_str_aux(MEM_ROOT *root, const LEX_CSTRING &from,
static char *dup_str_aux(MEM_ROOT *root, const char *from,
CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
{
- return dup_str_aux(root, from, from ? strlen(from) : 0 , fromcs, tocs);
+ return dup_str_aux(root, from, (uint) (from ? strlen(from) : 0),
+ fromcs, tocs);
}