diff options
| author | Chad MILLER <chad@mysql.com> | 2009-01-21 13:45:23 -0500 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-01-21 13:45:23 -0500 |
| commit | f68ccd024a6eeb8c5b6ebf40303bcf580e17d918 (patch) | |
| tree | f3c1ce77afa4c0b708ac702616710c680ec86ec2 /sql/opt_sum.cc | |
| parent | a2dcb6357984166b0cd8299f88b1d8e1925411dc (diff) | |
| parent | 8d16eb71b348830529ef9f1f8e528b3d0abd2967 (diff) | |
| download | mariadb-git-f68ccd024a6eeb8c5b6ebf40303bcf580e17d918.tar.gz | |
Merge from Tim's 5.0.76-release tree to make 5.0.77 .
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 3fc62d05ae5..39db1344588 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -160,7 +160,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) to the number of rows in the tables if this number is exact and there are no outer joins. */ - if (!conds && !((Item_sum_count*) item)->args[0]->maybe_null && + if (!conds && !((Item_sum_count*) item)->get_arg(0)->maybe_null && !outer_tables && is_exact_count) { ((Item_sum_count*) item)->make_const(count); @@ -176,7 +176,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) parts of the key is found in the COND, then we can use indexes to find the key. */ - Item *expr=item_sum->args[0]; + Item *expr=item_sum->get_arg(0); if (expr->real_item()->type() == Item::FIELD_ITEM) { byte key_buff[MAX_KEY_LENGTH]; @@ -319,7 +319,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) parts of the key is found in the COND, then we can use indexes to find the key. */ - Item *expr=item_sum->args[0]; + Item *expr=item_sum->get_arg(0); if (expr->real_item()->type() == Item::FIELD_ITEM) { byte key_buff[MAX_KEY_LENGTH]; |