bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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@stripped, 2001-08-04 16:37:29-06:00, sasha@stripped
  fixed error message numbers in union test

  mysql-test/t/union.test
    1.3 01/08/04 16:37:28 sasha@stripped +3 -3
    fixed error message numbers

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.2/mysql-test/t/union.test	Wed Aug  1 21:29:42 2001
+++ 1.3/mysql-test/t/union.test	Sat Aug  4 16:37:28 2001
@@ -19,11 +19,11 @@
 explain select a,b from t1 union all select a,b from t2;
 
 # Test some error conditions with UNION
---error 1213
+--error 1214
 select a,b from t1 into outfile 'skr' union select a,b from t2;
---error 1213
-select a,b from t1 order by a union select a,b from t2;
 --error 1214
+select a,b from t1 order by a union select a,b from t2;
+--error 1215
 select a,b from t1 union select a from t2;
 
 drop table t1,t2;