automerge

sql/sql_base.cc

@@ -7375,6 +7375,12 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
     /* make * substituting permanent */
     SELECT_LEX *select_lex= thd->lex->current_select;
     select_lex->with_wild= 0;
+    /*   
+      The assignment below is translated to memcpy() call (at least on some
+      platforms). memcpy() expects that source and destination areas do not
+      overlap. That problem was detected by valgrind. 
+    */
+    if (&select_lex->item_list != &fields)
       select_lex->item_list= fields;
 
     thd->restore_active_arena(arena, &backup);

sql/sql_select.cc

@@ -1807,6 +1807,7 @@ JOIN::exec()
       curr_join->having= curr_join->tmp_having= 0; // Allready done
     
     /* Change sum_fields reference to calculated fields in tmp_table */
+    if (curr_join != this)
       curr_join->all_fields= *curr_all_fields;
     if (!items1)
     {
@@ -1826,8 +1827,11 @@ JOIN::exec()
 				      fields_list.elements, all_fields))
 	  DBUG_VOID_RETURN;
       }
+      if (curr_join != this)
+      {
         curr_join->tmp_all_fields1= tmp_all_fields1;
         curr_join->tmp_fields_list1= tmp_fields_list1;
+      }
       curr_join->items1= items1;
     }
     curr_all_fields= &tmp_all_fields1;
@@ -1975,9 +1979,12 @@ JOIN::exec()
 				     tmp_fields_list2, tmp_all_fields2, 
 				     fields_list.elements, tmp_all_fields1))
 	  DBUG_VOID_RETURN;
+        if (curr_join != this)
+        {
           curr_join->tmp_fields_list2= tmp_fields_list2;
           curr_join->tmp_all_fields2= tmp_all_fields2;
         }
+      }
       curr_fields_list= &curr_join->tmp_fields_list2;
       curr_all_fields= &curr_join->tmp_all_fields2;
       curr_join->set_items_ref_array(items2);
@@ -2031,9 +2038,12 @@ JOIN::exec()
       tmp_table_param.save_copy_field= curr_join->tmp_table_param.copy_field;
       tmp_table_param.save_copy_field_end=
 	curr_join->tmp_table_param.copy_field_end;
+      if (curr_join != this)
+      {
         curr_join->tmp_all_fields3= tmp_all_fields3;
         curr_join->tmp_fields_list3= tmp_fields_list3;
       }
+    }
     else
     {
       curr_join->tmp_table_param.copy_funcs= tmp_table_param.save_copy_funcs;

sql/sql_select.h

@@ -466,6 +466,7 @@ public:
     group_optimized_away= 0;
 
     all_fields= fields_arg;
+    if (&fields_list != &fields_arg)      /* Avoid valgrind-warning */
       fields_list= fields_arg;
     bzero((char*) &keyuse,sizeof(keyuse));
     tmp_table_param.init();