Commit c7ab92c2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1
parents e9cb2fb3 2e16838c

sql/sql_select.cc

+4 −5
Original line number Diff line number Diff line
@@ -8223,12 +8223,10 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref) 
  thd->count_cuted_fields= CHECK_FIELD_IGNORE;

  for (store_key **copy=ref->key_copy ; *copy ; copy++)

  {

    int res;

    if ((res= (*copy)->copy()))

    if ((*copy)->copy() & 1)

    {

      thd->count_cuted_fields= save_count_cuted_fields;

      if ((res= res & 1))

        return res;                               // Something went wrong

      return 1;                                 // Something went wrong

    }

  }

  thd->count_cuted_fields= save_count_cuted_fields;
@@ -8827,7 +8825,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param, 
  DBUG_RETURN(0);



 err:

  delete [] param->copy_field;			// This is never 0

  if (copy)

    delete [] param->copy_field;

  param->copy_field=0;

err2:

  DBUG_RETURN(TRUE);