diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-13 20:04:48 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-13 20:04:48 -0700 |
| commit | 69e344e0b2a349e159455aa6eaa48c2eab23fa12 (patch) | |
| tree | 2d1777da3949c4de5d096c2cc3198d369013fa9d /sql/opt_sum.cc | |
| parent | 86334edf2e37bf69ec601b9b7d419587316dc424 (diff) | |
| parent | 36b49259b1965743f12cd072bd033162becfbd10 (diff) | |
| download | mariadb-git-69e344e0b2a349e159455aa6eaa48c2eab23fa12.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/t/ctype_utf8.test:
Auto merged
sql/opt_sum.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Manual merge
sql/field.cc:
Manual merge
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 4a7ec0c5928..9770198640c 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -569,10 +569,6 @@ static bool matching_cond(bool max_fl, TABLE_REF *ref, KEY *keyinfo, break; // Found a part od the key for the field } -#if 0 - if (part->length != (((Item_field*) args[0])->field)->field_length) - return 0; -#endif bool is_field_part= part == field_part; if (!(is_field_part || eq_type)) return 0; |