diff options
author | unknown <igor@rurik.mysql.com> | 2003-12-01 18:47:19 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2003-12-01 18:47:19 -0800 |
commit | 7b853c645db94e179be5a4086feb5ccb4088280e (patch) | |
tree | 31494d26df6b929335d01f1c5d1433017038d9f5 /sql/opt_sum.cc | |
parent | f6697593d252efc2d4a41897fb503e1598af97ad (diff) | |
parent | 7daa6cdc1358b0abcf24a28ed6eda57ba3533d23 (diff) | |
download | mariadb-git-7b853c645db94e179be5a4086feb5ccb4088280e.tar.gz |
Merge
mysql-test/t/range.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r-- | sql/opt_sum.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index ce650701347..03be9624cd8 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -83,7 +83,6 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) table_map removed_tables= 0, outer_tables= 0, used_tables= 0; table_map where_tables= 0; Item *item; - COND *org_conds= conds; int error; if (conds) |