Merge

Docs/manual.texi:
  merged

.bzrignore

@@ -392,3 +392,12 @@ Docs/manual.tp
 Docs/manual.vr
 Docs/manual_a4.ps
 Docs/manual_letter.ps
+mysql-test/var/lib/test/test1.frm
+mysql-test/var/lib/test/test1.MYD
+mysql-test/var/lib/test/test1.MYI
+mysql-test/var/lib/test/test2.frm
+mysql-test/var/lib/test/test2.MYD
+mysql-test/var/lib/test/test2.MYI
+mysql-test/var/run/mysqld.pid
+mysql-test/var/tmp/mysql.sock
+mysql-test/var/lib/mysql-bin.008

BitKeeper/etc/logging_ok

@@ -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

@@ -39275,6 +39275,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

mysql-test/r/3.23/sel000100.result

+key_link_id	link	
+NULL	NULL	

mysql-test/t/3.23/sel000100.test

+DROP TABLE IF EXISTS test1;
+DROP TABLE IF EXISTS test2;
+
+CREATE TABLE test1 (
+  ID int(11) NOT NULL auto_increment,
+  NAME varchar(75) DEFAULT '' NOT NULL,
+  LINK_ID int(11) DEFAULT '0' NOT NULL,
+  PRIMARY KEY (ID),
+  KEY NAME (NAME),
+  KEY LINK_ID (LINK_ID)
+);
+
+INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (1,'Mike',0);
+INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (2,'Jack',0);
+INSERT INTO test1 (ID, NAME, LINK_ID) VALUES (3,'Bill',0);
+
+CREATE TABLE test2 (
+  ID int(11) NOT NULL auto_increment,
+  NAME varchar(150) DEFAULT '' NOT NULL,
+  PRIMARY KEY (ID),
+  KEY NAME (NAME)
+);
+
+@r/3.23/sel000100.result SELECT DISTINCT
+    test2.id AS key_link_id,
+    test2.name AS link
+FROM test1
+LEFT JOIN test2 ON test1.link_id=test2.id
+GROUP BY test1.id
+ORDER BY link;

sql/sql_select.cc

@@ -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