summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2003-10-03 17:55:57 -0400
committerunknown <vva@eagle.mysql.r18.ru>2003-10-03 17:55:57 -0400
commit63ed77ca1d3d66148048dd46cf9f781fb5abe7f3 (patch)
tree2d0a5155d5b413b40e3ff0ccd3891972e0180cca /sql
parent0adf47e67ac25d47490c9566231518c3ef8cbefc (diff)
parent496bc77694abe410bed1968fc34cf685d765131f (diff)
downloadmariadb-git-63ed77ca1d3d66148048dd46cf9f781fb5abe7f3.tar.gz
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 53c41482a36..bffe3cd7968 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3706,6 +3706,8 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
new_field->field_name=item->name;
if (org_field->maybe_null())
new_field->flags&= ~NOT_NULL_FLAG; // Because of outer join
+ if (org_field->type()==FIELD_TYPE_VAR_STRING)
+ table->db_create_options|= HA_OPTION_PACK_RECORD;
}
return new_field;
}