bk commit into 5.0 tree (jan:1.1960)

[Jan Lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan 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
  1.1960 05/07/20 13:47:05 jan@stripped +1 -0
  Merge jlindstrom@stripped:/home/bk/mysql-5.0
  into  hundin.mysql.fi:/home/jan/new/mysql-5.0

  BitKeeper/etc/ignore
    1.205 05/07/20 13:46:37 jan@stripped +5 -5
    auto-union

# 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:	jan
# Host:	hundin.mysql.fi
# Root:	/home/jan/new/mysql-5.0/RESYNC

--- 1.204/BitKeeper/etc/ignore	2005-07-19 10:02:23 +03:00
+++ 1.205/BitKeeper/etc/ignore	2005-07-20 13:46:37 +03:00
@@ -312,6 +312,7 @@
 extra/charset2html
 extra/comp_err
 extra/created_include_files
+extra/innochecksum
 extra/my_print_defaults
 extra/mysql_install
 extra/mysql_tzinfo_to_sql
@@ -357,6 +358,7 @@
 innobase/conftest.subs
 innobase/ib_config.h
 innobase/ib_config.h.in
+innobase/mkinstalldirs
 innobase/stamp-h1
 insert_test
 install
@@ -537,6 +539,7 @@
 mit-pthreads/pg++
 mit-pthreads/pgcc
 mit-pthreads/syscall.S
+mkinstalldirs
 myisam/FT1.MYD
 myisam/FT1.MYI
 myisam/ft_dump
@@ -639,6 +642,7 @@
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
 mysql-test/t/index_merge.load
+mysql-test/var
 mysql-test/var/*
 mysql.kdevprj
 mysql.proj
@@ -793,6 +797,7 @@
 ndb/src/common/transporter/libtransporter.dsp
 ndb/src/common/util/libgeneral.dsp
 ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/dummy.cpp
 ndb/src/kernel/blocks/backup/libbackup.dsp
 ndb/src/kernel/blocks/backup/restore/ndb_restore
 ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
@@ -1116,5 +1121,3 @@
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-ndb/src/dummy.cpp
-extra/innochecksum