bk commit into 5.0 tree (igor:1.1806)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1806 05/03/13 01:07:01 igor@stripped +1 -0
  join_outer.test:
    Correction after manual merge.

  mysql-test/t/join_outer.test
    1.23 05/03/13 01:05:53 igor@stripped +6 -0
    Correction after manual merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.22/mysql-test/t/join_outer.test	Sun Mar 13 00:40:51 2005
+++ 1.23/mysql-test/t/join_outer.test	Sun Mar 13 01:05:53 2005
@@ -588,6 +588,12 @@
 INSERT INTO t2 VALUES("10", "EN", "10-EN");
 INSERT INTO t2 VALUES("10", "SV", "10-SV");
 
+SELECT t1.id, t1.text_id, t2.text_data
+  FROM t1 LEFT JOIN t2
+               ON t1.text_id = t2.text_id
+                  AND t2.language_id = 'SV'
+  WHERE (t1.id LIKE '%' OR t2.text_data LIKE '%');
+
 DROP TABLE t1, t2;
 
 # Test for bug #5896