Commit b37a5568 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

bk resolve work

parents e1d12383 62f56301

BitKeeper/etc/logging_ok

+10 −0
Original line number Diff line number Diff line 
Sinisa@sinisa.nasamreza.org

heikki@donna.mysql.fi

jani@hynda.mysql.fi

jani@janikt.pp.saunalahti.fi

jcole@abel.spaceapes.com

jcole@main.burghcom.com

jcole@tetra.spaceapes.com

monty@donna.mysql.fi

monty@hundin.mysql.fi

monty@tik.mysql.fi

monty@work.mysql.com

mwagner@evoq.mwagner.org

paul@central.snake.net

paul@teton.kitebird.com

root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tim@hundin.mysql.fi

tim@threads.polyesthetic.msg

tim@work.mysql.com

tonu@hundin.mysql.fi

tonu@x3.internalnet

sql/filesort.cc

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, 
      buffpek=(BUFFPEK*) queue_top(&queue);

      if (cmp)					// Remove duplicates

      {

	if (!cmp(&sort_length, param->unique_buff, (uchar*) buffpek->key))

	if (!cmp(&sort_length, &(param->unique_buff), (uchar**) &buffpek->key))

	  goto skip_duplicate;

	memcpy(param->unique_buff, (uchar*) buffpek->key,sort_length);

      }

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables) 
{

  if (!ref)

  {

    if (!(ref=find_item_in_list(this,thd->lex.item_list)))

    if (!(ref=find_item_in_list(this,thd->lex.select->item_list)))

      return 1;

    max_length= (*ref)->max_length;

    maybe_null= (*ref)->maybe_null;

sql/item_sum.cc

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ bool Item_sum_count_distinct::setup(THD *thd) 
    tmp_table_param->cleanup();

  }

  if (!(table=create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1,

			       0, 0, current_lex->options | thd->options)))

			       0, 0, current_lex->select->options | thd->options)))

    return 1;

  table->file->extra(HA_EXTRA_NO_ROWS);		// Don't update rows

  table->no_rows=1;

sql/mysql_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ extern int sql_cache_hit(THD *thd, char *inBuf, uint length); 


inline bool add_item_to_list(Item *item)

{

  return current_lex->item_list.push_back(item);

  return current_lex->select->item_list.push_back(item);

}

inline bool add_value_to_list(Item *value)

{
@@ -675,11 +675,11 @@ inline bool add_value_to_list(Item *value) 
}

inline bool add_order_to_list(Item *item,bool asc)

{

  return add_to_list(current_lex->order_list,item,asc);

  return add_to_list(current_lex->select->order_list,item,asc);

}

inline bool add_group_to_list(Item *item,bool asc)

{

  return add_to_list(current_lex->group_list,item,asc);

  return add_to_list(current_lex->select->group_list,item,asc);

}

inline void mark_as_null_row(TABLE *table)

{