bk commit into 4.1 tree (Sinisa:1.1805)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1805 04/05/04 14:11:23 Sinisa@stripped +2 -0
  union.result, union.test:
    a small fix for the test case

  mysql-test/r/union.result
    1.67 04/05/04 13:39:34 Sinisa@stripped +1 -0
    a small fix for the test case

  mysql-test/t/union.test
    1.64 04/05/04 13:39:21 Sinisa@stripped +1 -0
    a small fix for the test case

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.66/mysql-test/r/union.result	Mon May  3 19:15:19 2004
+++ 1.67/mysql-test/r/union.result	Tue May  4 13:39:34 2004
@@ -935,3 +935,4 @@
 1
 1
 2
+set sql_select_limit=1;

--- 1.63/mysql-test/t/union.test	Mon May  3 19:15:19 2004
+++ 1.64/mysql-test/t/union.test	Tue May  4 13:39:21 2004
@@ -502,4 +502,5 @@
 select 1 union select 2;
 (select 1) union (select 2);
 (select 1) union (select 2) union (select 3) limit 2;
+set sql_select_limit=1;