From 6a00401a6090b58c2141da86b19fcc17e7102072 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed, 17 Sep 2014 00:51:40 +0200
Subject: [PATCH] - Fix a compile error (MDEV-6723) modified:  
 storage/connect/tabwmi.cpp

- Was change in revision 4029 but not listed then.
modified:
  storage/connect/mysql-test/connect/r/updelx.result
---
 storage/connect/tabwmi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/connect/tabwmi.cpp b/storage/connect/tabwmi.cpp
index e47df028dc2..f93776c31da 100644
--- a/storage/connect/tabwmi.cpp
+++ b/storage/connect/tabwmi.cpp
@@ -200,7 +200,7 @@ PQRYRES WMIColumns(PGLOBAL g, char *nsp, char *cls, bool info)
         }  // endif res
 
       len = (unsigned)SysStringLen(propname);
-      length[0] = max(length[0], len);
+      length[0] = MY_MAX(length[0], len);
       } // enfor i
 
     res = SafeArrayDestroy(prnlist);