diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-06-17 14:21:37 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-06-17 14:21:37 +0200 |
| commit | 79180b1994bee1cc432f2fe968f422613857b2eb (patch) | |
| tree | 3c6860a99dc258b8b686bb0b9c892295e5d008c9 | |
| parent | af0202f270957e47ad6a350f7c41091999e680fc (diff) | |
| parent | 30aabe00dee00a76f229a8ff12856f385cda341b (diff) | |
| download | mariadb-git-79180b1994bee1cc432f2fe968f422613857b2eb.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 80597aff3ac..78b611fda40 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", @@ -11604,7 +11606,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; @@ -11685,7 +11687,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; |