summaryrefslogtreecommitdiff
path: root/sql/sql_lifo_buffer.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-11-22 17:08:22 +0300
committerSergey Petrunya <psergey@askmonty.org>2010-11-22 17:08:22 +0300
commit2ec43747f502c0a405793d30b3aa7b1b44ccc48e (patch)
treeec0e2540a1e02e7284144d89b7fec4accd6695d8 /sql/sql_lifo_buffer.h
parentc635eb331944a8cb970b120c6a3d94ea1ac38fcc (diff)
downloadmariadb-git-2ec43747f502c0a405793d30b3aa7b1b44ccc48e.tar.gz
Merge MWL#121-125 DS-MRR improvements
- Address Monty's review feedback, part 1
Diffstat (limited to 'sql/sql_lifo_buffer.h')
-rw-r--r--sql/sql_lifo_buffer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h
index 8718177fc4f..f85bc1e6c41 100644
--- a/sql/sql_lifo_buffer.h
+++ b/sql/sql_lifo_buffer.h
@@ -150,7 +150,7 @@ public:
enum_direction type() { return FORWARD; }
size_t used_size()
{
- return pos - start;
+ return (size_t)(pos - start);
}
void reset()
{
@@ -243,7 +243,7 @@ public:
size_t used_size()
{
- return end - pos;
+ return (size_t)(end - pos);
}
void reset()
{