From 068c61978e3a81836d52b8caf11e044290159ad1 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 26 Mar 2013 00:03:13 +0200 Subject: Temporary commit of 10.0-merge --- storage/maria/ma_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'storage/maria/ma_info.c') diff --git a/storage/maria/ma_info.c b/storage/maria/ma_info.c index 341ea147785..912ed0984a3 100644 --- a/storage/maria/ma_info.c +++ b/storage/maria/ma_info.c @@ -31,7 +31,7 @@ MARIA_RECORD_POS maria_position(MARIA_HA *info) uint maria_max_key_length() { uint tmp= (_ma_max_key_length() - 8 - HA_MAX_KEY_SEG*3); - return min(HA_MAX_KEY_LENGTH, tmp); + return MY_MIN(HA_MAX_KEY_LENGTH, tmp); } /* Get information about the table */ -- cgit v1.2.1