From 3143ad589a24ac7581e2195ba0dc13576cb3c9da Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Tue, 21 May 2013 22:00:08 +0300
Subject: Push a lot of small fixes to get larger parts to compile

---
 libmysqld/lib_sql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmysqld/lib_sql.cc')

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 6d718a6baa6..6f8f9ddcfd5 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -885,7 +885,7 @@ write_eof_packet(THD *thd, uint server_status, uint statement_warn_count)
     is cleared between substatements, and mysqltest gets confused
   */
   thd->cur_data->embedded_info->warning_count=
-    (thd->spcont ? 0 : min(statement_warn_count, 65535));
+    (thd->spcont ? 0 : MY_MIN(statement_warn_count, 65535));
   return FALSE;
 }
 
-- 
cgit v1.2.1