diff options
| author | monty@donna.mysql.fi <> | 2001-04-29 16:07:40 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-04-29 16:07:40 +0300 |
| commit | e30fd503ec15039b5efbce0eaaac32206a7a8db1 (patch) | |
| tree | 36a0842f7006e1ed083c85dcac3b3ecc00646bfd /sql/sql_select.cc | |
| parent | 6261dafb27bec72f7ba248b3ddf5559771951c90 (diff) | |
| download | mariadb-git-e30fd503ec15039b5efbce0eaaac32206a7a8db1.tar.gz | |
Cleanup
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index be1444c52e4..aad84cfd1b9 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -210,7 +210,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, { if (item->with_sum_func) flag|=1; - else if (!item->const_item()) + else if (!(flag & 2) && !item->const_item()) flag|=2; } if (flag == 3) @@ -871,7 +871,6 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, s->join=join; if ((s->on_expr=tables->on_expr)) { - // table->maybe_null=table->outer_join=1; // Mark for send fields if (!table->file->records) { // Empty table s->key_dependent=s->dependent=0; |