database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Simple cleanups

Browse Source
This commit is contained in:
monty@mysql.com
2003-12-18 14:40:19 +02:00
parent 6e58a7c49e
commit b9d8f108c1
3 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/auto_increment.test
View File

@ -82,7 +82,7 @@ insert into t1 values (NULL);
select * from t1; select * from t1;
drop table t1; drop table t1;
create table t1 (a int not null auto_increment primary key) /*!41002 type=heap */; create table t1 (a int not null auto_increment primary key) /*!40102 type=heap */;
insert into t1 values (NULL); insert into t1 values (NULL);
insert into t1 values (-1); insert into t1 values (-1);
select last_insert_id(); select last_insert_id();

1
sql/opt_range.cc
View File

@ -1076,7 +1076,6 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
all rows between 'X' and 'X ...' all rows between 'X' and 'X ...'
*/ */
uint length= uint2korr(str+maybe_null); uint length= uint2korr(str+maybe_null);
char *end;
str2= str+ key_part->part_length + maybe_null; str2= str+ key_part->part_length + maybe_null;
/* remove end space */ /* remove end space */
while (length > 0 && str[length+HA_KEY_BLOB_LENGTH+maybe_null-1] == ' ') while (length > 0 && str[length+HA_KEY_BLOB_LENGTH+maybe_null-1] == ' ')

56
sql/sql_select.cc
View File

@ -1771,41 +1771,37 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
uint tables, COND *cond, table_map normal_tables) uint tables, COND *cond, table_map normal_tables)
{ {
uint and_level,i,found_eq_constant; uint and_level,i,found_eq_constant;
KEY_FIELD *key_fields, *end, *field;
if (!(key_fields=(KEY_FIELD*)
thd->alloc(sizeof(key_fields[0])*(thd->cond_count+1)*2)))
return TRUE; /* purecov: inspected */
and_level=0; field=end=key_fields;
if (my_init_dynamic_array(keyuse,sizeof(KEYUSE),20,64))
return TRUE;
if (cond)
{ {
KEY_FIELD *key_fields,*end; add_key_fields(join_tab,&end,&and_level,cond,normal_tables);
KEY_FIELD *field;
if (!(key_fields=(KEY_FIELD*)
thd->alloc(sizeof(key_fields[0])*(thd->cond_count+1)*2)))
return TRUE; /* purecov: inspected */
and_level=0; field=end=key_fields;
if (my_init_dynamic_array(keyuse,sizeof(KEYUSE),20,64))
return TRUE;
if (cond)
{
add_key_fields(join_tab,&end,&and_level,cond,normal_tables);
for (; field != end ; field++)
{
add_key_part(keyuse,field);
/* Mark that we can optimize LEFT JOIN */
if (field->val->type() == Item::NULL_ITEM &&
!field->field->real_maybe_null())
field->field->table->reginfo.not_exists_optimize=1;
}
}
for (i=0 ; i < tables ; i++)
{
if (join_tab[i].on_expr)
{
add_key_fields(join_tab,&end,&and_level,join_tab[i].on_expr,
join_tab[i].table->map);
}
}
/* fill keyuse with found key parts */
for (; field != end ; field++) for (; field != end ; field++)
{
add_key_part(keyuse,field); add_key_part(keyuse,field);
/* Mark that we can optimize LEFT JOIN */
if (field->val->type() == Item::NULL_ITEM &&
!field->field->real_maybe_null())
field->field->table->reginfo.not_exists_optimize=1;
}
} }
for (i=0 ; i < tables ; i++)
{
if (join_tab[i].on_expr)
{
add_key_fields(join_tab,&end,&and_level,join_tab[i].on_expr,
join_tab[i].table->map);
}
}
/* fill keyuse with found key parts */
for (; field != end ; field++)
add_key_part(keyuse,field);
if (thd->lex.select->ftfunc_list.elements) if (thd->lex.select->ftfunc_list.elements)
{ {