diff options
| author | monty@mysql.com <> | 2006-06-19 12:45:34 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-06-19 12:45:34 +0300 |
| commit | 860661a2dc5905396f1e6ee4b163bdf29dc2b6fe (patch) | |
| tree | b1eef84ec3b6195237d928b1ebea0aaa0acf90a7 /sql/opt_range.cc | |
| parent | 37d7bbb335fd3d3c578a724790ce5f5cbc049ce9 (diff) | |
| download | mariadb-git-860661a2dc5905396f1e6ee4b163bdf29dc2b6fe.tar.gz | |
unsigned char -> uchar
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index c905d8aada7..21d5cb28ea2 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -5157,8 +5157,8 @@ get_mm_parts(RANGE_OPT_PARAM *param, COND *cond_func, Field *field, static SEL_ARG * -get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, - Item_func::Functype type,Item *value) +get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field, + KEY_PART *key_part, Item_func::Functype type,Item *value) { uint maybe_null=(uint) field->real_maybe_null(); bool optimize_range; @@ -9119,10 +9119,10 @@ get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree, uint field_length= cur_part->store_length; if ((cur_range->maybe_null && - cur_range->min_value[0] && cur_range->max_value[0]) - || - (memcmp(cur_range->min_value, cur_range->max_value, field_length) == 0)) - { /* cur_range specifies 'IS NULL' or an equality condition. */ + cur_range->min_value[0] && cur_range->max_value[0]) || + !memcmp(cur_range->min_value, cur_range->max_value, field_length)) + { + /* cur_range specifies 'IS NULL' or an equality condition. */ memcpy(key_ptr, cur_range->min_value, field_length); key_ptr+= field_length; *key_infix_len+= field_length; |