Commit b9832b9f authored by sasha@donna.mysql.com's avatar sasha@donna.mysql.com
Browse files

Merge work:/my/mysql into donna.mysql.com:/home/my/mysql-new

parents ef5af41e 402e8e5c

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ tim@threads.polyesthetic.msg 
tim@work.mysql.com

yfaktoro@nbyfaktoro.bedford.progress.com

yfaktoro@nslinuxw2.bedford.progress.com

sasha@donna.mysql.com

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -39228,6 +39228,9 @@ though, so Version 3.23 is not released as a stable version yet. 
@appendixsubsec Changes in release 3.23.29

@itemize @bullet

@item

Fixed bug when doing a @code{SELECT DISTINCT ... table1 LEFT JOIN

table2..] when table2 was empty.

@item

Added @code{--abort-slave-event-count} and

@code{--disconnect-slave-event-count} options to @code{mysqld} for

debugging and testing of replication

sql/sql_select.cc

+3 −1
Original line number Diff line number Diff line
@@ -5218,8 +5218,10 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields) 
  List_iterator<Item> it(fields);

  Item *item;

  while ((item=it++))

    if (item->tmp_table_field())

  {

    if (item->tmp_table_field() && ! item->const_item())

      field_count++;

  }



  if (!field_count)

  {						// only const items