Merge with global tree

1 files changed, 2 insertions, 1 deletions

diff --git a/extra/perror.c b/extra/perror.c
index 6e632b20d96..d68f5230e4a 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -250,7 +250,8 @@ int main(int argc,char *argv[])
         'Unknown Error' (without regard to case).
       */
       if (msg &&
-          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&
+          my_strnncoll(&my_charset_latin1, (const uchar*) msg, 13,
+                       (const uchar*) "Unknown Error", 13) &&
           (!unknown_error || strcmp(msg, unknown_error)))
       {
 	found=1;