From 9b3d0b85a3c372ac7ac8be0cbec859cba8f13a57 Mon Sep 17 00:00:00 2001 From: "tulin@dl145c.mysql.com" <> Date: Fri, 17 Jun 2005 12:36:09 +0200 Subject: [PATCH] sql_select.cc: fixed 64bit bug in lenght store/retrive in cache --- sql/sql_select.cc | 6 ++++-- 1 file 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 #include +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;