database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1


include/my_sys.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
This commit is contained in:
unknown
2006-06-19 13:00:36 +03:00
parent 9f8c532f0c 4b316e6fd6
commit cd3fa2ee71
19 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/opt_range.cc
View File

@ -5164,8 +5164,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;
@ -9126,10 +9126,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;