summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <tulin@dl145c.mysql.com>2005-06-17 12:36:09 +0200
committerunknown <tulin@dl145c.mysql.com>2005-06-17 12:36:09 +0200
commit6de6d3ad5cc34a53735b0b12ca80846d50537f62 (patch)
treecfe72c32b19d08c80f8399bf1654da6fb3bf2626 /sql/sql_select.cc
parentc0484a301f1dfdac6b63b25cf0e4697a2ad9d05c (diff)
downloadmariadb-git-6de6d3ad5cc34a53735b0b12ca80846d50537f62.tar.gz
sql_select.cc:
fixed 64bit bug in lenght store/retrive in cache sql/sql_select.cc: fixed 64bit bug in lenght store/retrive in cache
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 352227acc68..afb221b03ba 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -28,6 +28,8 @@
#include <hash.h>
#include <ft_global.h>
+typedef uint32 cache_rec_length_type;
+
const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
"MAYBE_REF","ALL","range","index","fulltext",
"ref_or_null","unique_subquery","index_subquery"
@@ -8067,7 +8069,7 @@ used_blob_length(CACHE_FIELD **ptr)
static bool
store_record_in_cache(JOIN_CACHE *cache)
{
- ulong length;
+ cache_rec_length_type length;
uchar *pos;
CACHE_FIELD *copy,*end_field;
bool last_record;
@@ -8148,7 +8150,7 @@ static void
read_cached_record(JOIN_TAB *tab)
{
uchar *pos;
- uint length;
+ cache_rec_length_type length;
bool last_record;
CACHE_FIELD *copy,*end_field;