bk commit into 5.1 tree (msvensson:1.2428)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2007-02-13 10:00:59+01:00, msvensson@stripped +1 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2414.1.18

  BitKeeper/etc/ignore@stripped, 2007-02-13 10:00:51+01:00, msvensson@stripped +0 -0
    auto-union
    MERGE: 1.270.1.5

# 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:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.274/BitKeeper/etc/ignore	2007-02-06 15:12:02 +01:00
+++ 1.275/BitKeeper/etc/ignore	2007-02-13 10:00:51 +01:00
@@ -1255,6 +1255,7 @@
 mysql-test/mysql-test-run.log
 mysql-test/mysql_test_run_new
 mysql-test/ndb/ndbcluster
+mysql-test/partitions.log
 mysql-test/r/*.err
 mysql-test/r/*.log
 mysql-test/r/*.out
@@ -1334,8 +1335,21 @@
 mysql-test/r/system_mysql_db.log
 mysql-test/r/tmp.result
 mysql-test/r/udf.log
+mysql-test/rpl.log
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
+mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/innodb_views.warnings
+mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
+mysql-test/suite/funcs_1/r/memory_views.warnings
+mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings
+mysql-test/suite/funcs_1/r/myisam_views.warnings
+mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/ndb_views.warnings
+mysql-test/suite/partitions/r/diff
+mysql-test/suite/partitions/r/partition_bit_ndb.warnings
+mysql-test/suite/partitions/r/partition_special_innodb.warnings
+mysql-test/suite/partitions/r/partition_special_myisam.warnings
 mysql-test/t/index_merge.load
 mysql-test/t/tmp.test
 mysql-test/var