Commit 8812c190 authored by unknown's avatar unknown
Browse files

Merge dl145c:tomas/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/sql_select.cc:
  Auto merged
parents a4d78173 30aabe00

sql/sql_select.cc

+4 −2
Original line number Diff line number Diff line
@@ -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",
@@ -11607,7 +11609,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;
@@ -11688,7 +11690,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;