summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-02-19 13:43:01 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-02-19 13:43:01 +0100
commit70a7e97e3cc32b0263e1428ca5fa27e720920dc2 (patch)
tree37590228b507a095340c11c7480fc47ccc2b57ac /sql/sql_join_cache.cc
parent28cb3b85b916f0f15d01660911871c4172021979 (diff)
downloadmariadb-git-70a7e97e3cc32b0263e1428ca5fa27e720920dc2.tar.gz
Fixed high-impact Windows 64bit warnings (at least 4000 of them)
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 94962f067fa..be3def865a8 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -1230,7 +1230,7 @@ uint JOIN_CACHE::write_record_data(uchar * link, bool *is_full)
/* Make an adjustment for the size of the auxiliary buffer if there is any */
uint incr= aux_buffer_incr(records);
- ulong rem= rem_space();
+ size_t rem= rem_space();
aux_buff_size+= len+incr < rem ? incr : rem;
/*