database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.0-serg -> 10.0

Browse Source
This commit is contained in:
Sergey Petrunya
2013-08-07 17:21:37 +04:00
parent 8e36dde7e1 a765e035a0
commit a3d79f2e58
1488 changed files with 126487 additions and 46392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_join_cache.h
View File

@ -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);
}
/*