From 7354dc67737fdeb105656f5cec055da627bb9c29 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 28 Sep 2017 10:38:02 +0000
Subject: MDEV-13384 - misc Windows warnings fixed

---
 sql/sql_error.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sql/sql_error.h')

diff --git a/sql/sql_error.h b/sql/sql_error.h
index 3aef5d38368..0a1e7d38e01 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -571,7 +571,10 @@ public:
   ErrConvString(const String *s)
     : ErrConv(), str(s->ptr()), len(s->length()), cs(s->charset()) {}
   const char *ptr() const
-  { return err_conv(err_buffer, sizeof(err_buffer), str, len, cs); }
+  {
+    DBUG_ASSERT(len < UINT_MAX32);
+    return err_conv(err_buffer, (uint) sizeof(err_buffer), str, (uint) len, cs);
+  }
 };
 
 class ErrConvInteger : public ErrConv
-- 
cgit v1.2.1