From 068c61978e3a81836d52b8caf11e044290159ad1 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Tue, 26 Mar 2013 00:03:13 +0200
Subject: Temporary commit of 10.0-merge

---
 storage/myisam/mi_test2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'storage/myisam/mi_test2.c')

diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 3ec12ef5cca..e53c68874b2 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
@@ -597,7 +597,7 @@ int main(int argc, char *argv[])
     goto err;
 
   bmove(read_record2,read_record,reclength);
-  for (i=min(2,keys) ; i-- > 0 ;)
+  for (i=MY_MIN(2,keys) ; i-- > 0 ;)
   {
     if (mi_rsame(file,read_record2,(int) i)) goto err;
     if (memcmp(read_record,read_record2,reclength) != 0)
-- 
cgit v1.2.1