bk commit into 4.0 tree (serg:1.1997)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg 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.1997 04/09/05 11:27:31 serg@stripped +3 -0
  union.test: drop table added

  mysql-test/t/union.test
    1.34 04/09/05 11:27:28 serg@stripped +1 -0
    drop table added

  mysql-test/r/union.result
    1.30 04/09/05 11:27:28 serg@stripped +1 -0
    drop table added

  BitKeeper/etc/ignore
    1.158 04/09/05 11:27:28 serg@stripped +1 -0
    Added support-files/my-innodb-heavy-4G.cnf to the ignore list

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.29/mysql-test/r/union.result	Mon Mar 22 15:34:49 2004
+++ 1.30/mysql-test/r/union.result	Sun Sep  5 11:27:28 2004
@@ -420,6 +420,7 @@
 (SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;
 Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'
 create temporary table t1 select a from t1 union select a from t2;
+drop table t1;
 create table t1 select a from t1 union select a from t2;
 INSERT TABLE 't1' isn't allowed in FROM table list
 select a from t1 union select a from t2 order by t2.a;

--- 1.33/mysql-test/t/union.test	Mon Mar 22 15:34:20 2004
+++ 1.34/mysql-test/t/union.test	Sun Sep  5 11:27:28 2004
@@ -224,6 +224,7 @@
 (SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;
 
 create temporary table t1 select a from t1 union select a from t2;
+drop table t1;
 --error 1093
 create table t1 select a from t1 union select a from t2;
 --error 1054

--- 1.157/BitKeeper/etc/ignore	Thu Aug 19 02:35:55 2004
+++ 1.158/BitKeeper/etc/ignore	Sun Sep  5 11:27:28 2004
@@ -545,3 +545,4 @@
 vio/viotest-ssl
 scripts/make_win_binary_distribution
 EXCEPTIONS-CLIENT
+support-files/my-innodb-heavy-4G.cnf