1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

An improvement of

Browse Source 
ChangeSet
  1.1707 04/03/19 12:36:55 ram@gw.mysql.r18.ru +4 -0
  Fix for the bug #2976: NATURAL JOIN produces duplicate columns.
This commit is contained in:
unknown 2004-03-30 15:54:26 +05:00
parent 6c937d7153
commit 3004dc7ef2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_base.cc
View File

@ -2290,16 +2290,20 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
DBUG_RETURN(-1); DBUG_RETURN(-1);
#endif #endif
Field **ptr=table->field,*field; Field **ptr=table->field,*field;
TABLE *natural_join_table;
thd->used_tables|=table->map; thd->used_tables|=table->map;
if (table->outer_join ||
!tables->natural_join ||
tables->natural_join->table->outer_join)
natural_join_table= NULL;
else
natural_join_table= tables->natural_join->table;
while ((field = *ptr++)) while ((field = *ptr++))
{ {
/* Skip duplicate field names if NATURAL JOIN is used */ /* Skip duplicate field names if NATURAL JOIN is used */
if (table->outer_join || if (!natural_join_table ||
!tables->natural_join || !find_field_in_table(thd, natural_join_table, field->field_name,
tables->natural_join->table->outer_join || strlen(field->field_name), 0, 0))
!find_field_in_table(thd, tables->natural_join->table,
field->field_name, strlen(field->field_name),
0, 0))
{ {
Item_field *item= new Item_field(field); Item_field *item= new Item_field(field);
if (!found++) if (!found++)