diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
| commit | a3d79f2e58562c7b50d50827a0149234c225ea43 (patch) | |
| tree | c266edef9eaf41a612e77972163d3d8eb0d280ba /sql/sql_join_cache.h | |
| parent | 8e36dde7e1f149d8973fe14d8288e678d1ba9b61 (diff) | |
| parent | a765e035a0c40ee04df42fba5c02484e83d31483 (diff) | |
| download | mariadb-git-a3d79f2e58562c7b50d50827a0149234c225ea43.tar.gz | |
Merge 10.0-serg -> 10.0
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 9ae54934472..25b5918ef60 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -421,7 +421,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); } /* @@ -944,7 +944,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); } /* |