Merge work.mysql.com:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

3 files changed, 38 insertions, 0 deletions

diff --git a/.bzrignore b/.bzrignore
index d0f97026511..692355e2022 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -392,3 +392,11 @@ 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
diff --git a/mysql-test/r/3.23/sel000100.res b/mysql-test/r/3.23/sel000100.res
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mysql-test/r/3.23/sel000100.res
diff --git a/mysql-test/t/3.23/sel000100.test b/mysql-test/t/3.23/sel000100.test
new file mode 100644
index 00000000000..20d5a3e2e3a
--- /dev/null
+++ b/mysql-test/t/3.23/sel000100.test
@@ -0,0 +1,30 @@
+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.res 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;