database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1

Browse Source 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-17 12:53:49 +02:00
parent db10586e80 6de6d3ad5c
commit 30aabe00de
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -28,6 +28,8 @@
#include <hash.h> #include <hash.h>
#include <ft_global.h> #include <ft_global.h>
typedef uint32 cache_rec_length_type;
const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref", const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
"MAYBE_REF","ALL","range","index","fulltext", "MAYBE_REF","ALL","range","index","fulltext",
"ref_or_null","unique_subquery","index_subquery", "ref_or_null","unique_subquery","index_subquery",
@ -11604,7 +11606,7 @@ used_blob_length(CACHE_FIELD **ptr)
static bool static bool
store_record_in_cache(JOIN_CACHE *cache) store_record_in_cache(JOIN_CACHE *cache)
{ {
ulong length; cache_rec_length_type length;
uchar *pos; uchar *pos;
CACHE_FIELD *copy,*end_field; CACHE_FIELD *copy,*end_field;
bool last_record; bool last_record;
@ -11685,7 +11687,7 @@ static void
read_cached_record(JOIN_TAB *tab) read_cached_record(JOIN_TAB *tab)
{ {
uchar *pos; uchar *pos;
uint length; cache_rec_length_type length;
bool last_record; bool last_record;
CACHE_FIELD *copy,*end_field; CACHE_FIELD *copy,*end_field;