bk commit into 5.0 tree (anjuta:1.2169)

[anna]

Below is the list of changes that have just been committed into a local
5.0 repository of anjuta. When anjuta 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.2169 06/06/05 12:19:53 anjuta@stripped +1 -0
  Merge anna@stripped:/home/bk/mysql-5.0
  into  arthur.local:/home/my/mysql-5.0

  BitKeeper/etc/ignore
    1.222 06/06/05 12:19:19 anjuta@stripped +12 -12
    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:	anjuta
# Host:	arthur.local
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.221/BitKeeper/etc/ignore	2006-06-01 12:34:38 +03:00
+++ 1.222/BitKeeper/etc/ignore	2006-06-05 12:19:19 +03:00
@@ -276,6 +276,7 @@
 bkpush.log*
 build.log
 build_tags.sh
+client/#mysql.cc#
 client/*.ds?
 client/*.vcproj
 client/completion_hash.cpp
@@ -290,6 +291,7 @@
 client/my_user.c
 client/mysql
 client/mysql.cpp
+client/mysql_upgrade
 client/mysqladmin
 client/mysqladmin.c
 client/mysqladmin.cpp
@@ -365,6 +367,9 @@
 extra/resolveip
 extra/sql_state.h
 extra/tztime.cc
+extra/yassl/taocrypt/benchmark/benchmark
+extra/yassl/taocrypt/test/test
+extra/yassl/testsuite/testsuite
 fcns.c
 fcns.h
 gdbinit
@@ -382,6 +387,7 @@
 include/mysql_version.h
 include/mysqld_ername.h
 include/mysqld_error.h
+include/openssl
 include/readline
 include/readline/*.h
 include/readline/readline.h
@@ -672,6 +678,7 @@
 mysql-test/r/bdb-crash.err
 mysql-test/r/bdb-deadlock.err
 mysql-test/r/bdb.err
+mysql-test/r/bdb.log
 mysql-test/r/bdb_cache.err
 mysql-test/r/client_test.err
 mysql-test/r/csv.err
@@ -679,6 +686,7 @@
 mysql-test/r/derived.err
 mysql-test/r/exampledb.err
 mysql-test/r/func_encrypt.err
+mysql-test/r/im_client_port.log
 mysql-test/r/index_merge_load.result
 mysql-test/r/isam.err
 mysql-test/r/lowercase_table2.err
@@ -727,6 +735,7 @@
 mysql-test/r/rpl_log.eval
 mysql-test/r/slave-running.eval
 mysql-test/r/slave-stopped.eval
+mysql-test/r/udf.log
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
 mysql-test/t/index_merge.load
@@ -1051,6 +1060,7 @@
 scripts/mysql_secure_installation
 scripts/mysql_setpermission
 scripts/mysql_tableinfo
+scripts/mysql_upgrade
 scripts/mysql_zap
 scripts/mysqlaccess
 scripts/mysqlbug
@@ -1142,7 +1152,9 @@
 sql/safe_to_cache_query.txt
 sql/share/*.sys
 sql/share/charsets/gmon.out
+sql/share/fixerrmsg.pl
 sql/share/gmon.out
+sql/share/iso639-2.txt
 sql/share/mysql
 sql/share/norwegian-ny/errmsg.sys
 sql/share/norwegian/errmsg.sys
@@ -1273,14 +1285,3 @@
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
-scripts/mysql_upgrade
-include/openssl
-mysql-test/r/bdb.log
-mysql-test/r/im_client_port.log
-mysql-test/r/udf.log
-extra/yassl/taocrypt/benchmark/benchmark
-extra/yassl/taocrypt/test/test
-extra/yassl/testsuite/testsuite
-client/mysql_upgrade
-sql/share/iso639-2.txt
-sql/share/fixerrmsg.pl