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

More after-merge fixes for patch fixing bug #2050

Browse Source
This commit is contained in:
dlenev@brandersnatch.localdomain
2004-04-01 00:19:30 +04:00
parent f38e0a935d
commit ad7e09dec4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@ -2337,10 +2337,12 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
while ((field = *ptr++)) while ((field = *ptr++))
{ {
uint not_used_field_index= NO_CACHED_FIELD_INDEX;
/* Skip duplicate field names if NATURAL JOIN is used */ /* Skip duplicate field names if NATURAL JOIN is used */
if (!natural_join_table || if (!natural_join_table ||
!find_field_in_table(thd, natural_join_table, field->field_name, !find_field_in_table(thd, natural_join_table, field->field_name,
strlen(field->field_name), 0, 0)) strlen(field->field_name), 0, 0,
&not_used_field_index))
{ {
Item_field *item= new Item_field(thd, field); Item_field *item= new Item_field(thd, field);
if (!found++) if (!found++)
@ -2434,9 +2436,11 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
for (t1_field= t1->field; (*t1_field); t1_field++) for (t1_field= t1->field; (*t1_field); t1_field++)
{ {
const char *t1_field_name= (*t1_field)->field_name; const char *t1_field_name= (*t1_field)->field_name;
uint not_used_field_index= NO_CACHED_FIELD_INDEX;
if ((t2_field= find_field_in_table(thd, t2, t1_field_name, if ((t2_field= find_field_in_table(thd, t2, t1_field_name,
strlen(t1_field_name), 0, 0))) strlen(t1_field_name), 0, 0,
&not_used_field_index)))
{ {
Item_func_eq *tmp=new Item_func_eq(new Item_field(*t1_field), Item_func_eq *tmp=new Item_func_eq(new Item_field(*t1_field),
new Item_field(t2_field)); new Item_field(t2_field));