summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-18 21:49:59 +0400
committerunknown <holyfoot/hf@mysql.com/deer.(none)>2006-11-18 21:49:59 +0400
commit934a231825080f1c7812a67318f0cf83c05854a9 (patch)
treec3be7861f03be4b159e10e622be6ad5b08b2dcbc /sql/item_subselect.cc
parent092b8f9e9e3aee7af19158fc9eaf3402d9f3ca4e (diff)
downloadmariadb-git-934a231825080f1c7812a67318f0cf83c05854a9.tar.gz
merging
mysql-test/t/disabled.def: meging bug
Diffstat (limited to 'sql/item_subselect.cc')
-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 bd0f4fc56c5..c0fa2c718bc 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1682,7 +1682,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);