diff options
Diffstat (limited to 'sql/sql_join_cache.h')
| -rw-r--r-- | sql/sql_join_cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h index 6953f6881ee..1c56fc9b178 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -420,7 +420,7 @@ protected: /* Shall calculate how much space is remaining in the join buffer */ virtual size_t rem_space() { - return max(buff_size-(end_pos-buff)-aux_buff_size,0); + return MY_MAX(buff_size-(end_pos-buff)-aux_buff_size,0); } /* @@ -943,7 +943,7 @@ protected: */ size_t rem_space() { - return max(last_key_entry-end_pos-aux_buff_size,0); + return MY_MAX(last_key_entry-end_pos-aux_buff_size,0); } /* |