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

Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL

Browse Source 
Docs/manual.texi:
  Updated replication section
mysql-test/r/null_key.result:
  Added test UPDATE/DELETE with IS NULL on unique key
mysql-test/t/null_key.test:
  Added test UPDATE/DELETE with IS NULL on unique key
mysys/Makefile.am:
  Removed -f from $CP as this is not portable
  Fixed rule for testhash
sql/field.cc:
  Safety fix
sql/opt_range.cc:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
sql/opt_range.h:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
This commit is contained in:
unknown
2001-04-10 11:32:28 +03:00
parent c7105d8008
commit 92de72694b
7 changed files with 135 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sql/opt_range.cc
View File

@ -321,7 +321,7 @@ static bool get_quick_keys(PARAM *param,QUICK_SELECT *quick,KEY_PART *key,
static bool eq_tree(SEL_ARG* a,SEL_ARG *b);
static SEL_ARG null_element(SEL_ARG::IMPOSSIBLE);
static bool null_part_in_key(KEY_PART *key_part, const char *key, uint length);
/***************************************************************************
** Basic functions for SQL_SELECT and QUICK_SELECT
@ -2306,7 +2306,15 @@ get_quick_keys(PARAM *param,QUICK_SELECT *quick,KEY_PART *key,
KEY *table_key=quick->head->key_info+quick->index;
flag=EQ_RANGE;
if (table_key->flags & HA_NOSAME && key->part == table_key->key_parts-1)
flag|= UNIQUE_RANGE;
{
if (!(table_key->flags & HA_NULL_PART_KEY) ||
!null_part_in_key(key,
param->min_key,
(uint) (tmp_min_key - param->min_key)))
flag|= UNIQUE_RANGE;
else
flag|= NULL_RANGE;
}
}
}
@ -2339,7 +2347,7 @@ bool QUICK_SELECT::unique_key_range()
if (ranges.elements == 1)
{
QUICK_RANGE *tmp;
if ((tmp=ranges.head())->flag & EQ_RANGE)
if (((tmp=ranges.head())->flag & (EQ_RANGE | NULL_RANGE)) == EQ_RANGE)
{
KEY *key=head->key_info+index;
return ((key->flags & HA_NOSAME) &&
@ -2349,6 +2357,24 @@ bool QUICK_SELECT::unique_key_range()
return 0;
}
/* Returns true if any part of the key is NULL */
static bool null_part_in_key(KEY_PART *key_part, const char *key, uint length)
{
for (const char *end=key+length ;
key < end;
key+= key_part++->part_length)
{
if (key_part->null_bit)
{
if (*key++)
return 1;
}
}
return 0;
}
/****************************************************************************
** Create a QUICK RANGE based on a key
****************************************************************************/