summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-17 11:15:40 +0400
committerunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-17 11:15:40 +0400
commitbde03bcec4457189d3993d970d144cf646ce14d6 (patch)
tree316549b7dc6cec0a47b822782ef5613e3d5cff7f
parent96ad04dec087442aaa60eff7a74d8f8910a5e422 (diff)
downloadmariadb-git-bde03bcec4457189d3993d970d144cf646ce14d6.tar.gz
merging
-rw-r--r--sql/item_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index d2f8e092d00..551795acd53 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1639,7 +1639,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row)
res_field_type= sel_item->field_type();
item->decimals= sel_item->decimals;
item->unsigned_flag= sel_item->unsigned_flag;
- *maybe_null= sel_item->maybe_null;
+ maybe_null= sel_item->maybe_null;
if (!(row[i]= Item_cache::get_cache(res_type)))
return;
row[i]->setup(sel_item);