diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-11-11 06:07:38 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-11-11 06:07:38 +0400 |
| commit | 2892d3a2ab0f790b92e2e7da37e76ab680084b3c (patch) | |
| tree | 5ab8e236fdcd628ece92a5362dbe2c32fa6d48fb /sql/sql_class.cc | |
| parent | f60c55eab2838aa303a0e439f1d8026b3b5fbdb5 (diff) | |
| parent | 7e71e24c380ea9379a0f3021939c22ea5e584ed4 (diff) | |
| download | mariadb-git-2892d3a2ab0f790b92e2e7da37e76ab680084b3c.tar.gz | |
Merge gleb.loc:/home/uchum/5.0-opt
into gleb.loc:/home/uchum/5.1-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/subselect.result:
Merge with 5.0-opt.
mysql-test/t/subselect.test:
Merge with 5.0-opt.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1cba93a5bd5..c29be6a7540 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1899,7 +1899,7 @@ bool select_max_min_finder_subselect::send_data(List<Item> &items) { if (!cache) { - cache= Item_cache::get_cache(val_item->result_type()); + cache= Item_cache::get_cache(val_item); switch (val_item->result_type()) { case REAL_RESULT: |