bk commit into 4.1 tree (Sinisa:1.1806)

[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.1806 04/05/04 16:48:34 Sinisa@stripped +2 -0
  union.result:
    fixing typo
  union.test:
    fixing type

  mysql-test/r/union.result
    1.68 04/05/04 16:48:11 Sinisa@stripped +1 -1
    fixing typo

  mysql-test/t/union.test
    1.65 04/05/04 16:48:05 Sinisa@stripped +1 -1
    fixing type

# 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.67/mysql-test/r/union.result	Tue May  4 13:39:34 2004
+++ 1.68/mysql-test/r/union.result	Tue May  4 16:48:11 2004
@@ -935,4 +935,4 @@
 1
 1
 2
-set sql_select_limit=1;
+set sql_select_limit=default;

--- 1.64/mysql-test/t/union.test	Tue May  4 13:39:21 2004
+++ 1.65/mysql-test/t/union.test	Tue May  4 16:48:05 2004
@@ -502,5 +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;
+set sql_select_limit=default;