database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Temporary commit of 10.0-merge

Browse Source
This commit is contained in:
Michael Widenius
2013-03-26 00:03:13 +02:00
parent 35bc8f9f43
commit 068c61978e
649 changed files with 88289 additions and 22802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_join_cache.h
View File

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