summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-02-10 12:47:37 +0200
committerunknown <monty@hundin.mysql.fi>2002-02-10 12:47:37 +0200
commitc1caaf756f1b83a805505344240f74383aba9642 (patch)
tree7c1d39f59ed0aa7eba1303ca1a12035653eb1ae2 /sql/sql_select.cc
parent61b769d94a9bbbea987ce4fb3afbe1f6d47795cd (diff)
downloadmariadb-git-c1caaf756f1b83a805505344240f74383aba9642.tar.gz
Fixed bug in full join with many NULL fields.
Build-tools/Do-compile: Fixed 'touch' and 'chmod' of files. Docs/manual.texi: Changelog
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 57053b87fa6..1ee0d84e182 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5636,10 +5636,10 @@ SORT_FIELD *make_unireg_sortorder(ORDER *order, uint *length)
/*****************************************************************************
-** Fill join cache with packed records
-** Records are stored in tab->cache.buffer and last record in
-** last record is stored with pointers to blobs to support very big
-** records
+ Fill join cache with packed records
+ Records are stored in tab->cache.buffer and last record in
+ last record is stored with pointers to blobs to support very big
+ records
******************************************************************************/
static int
@@ -5701,7 +5701,7 @@ join_init_cache(THD *thd,JOIN_TAB *tables,uint table_count)
if (null_fields && tables[i].table->null_fields)
{ /* must copy null bits */
copy->str=(char*) tables[i].table->null_flags;
- copy->length=(tables[i].table->null_fields+7)/8;
+ copy->length=tables[i].table->null_bytes;
copy->strip=0;
copy->blob_field=0;
length+=copy->length;