Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0

into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa


BitKeeper/etc/ignore:
  auto-union

1 files changed, 83 insertions, 1 deletions

diff --git a/.bzrignore b/.bzrignore
index ac17052c71f..9fbb34e1f71 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -27,18 +27,24 @@
 .out
 .snprj/*
 .vimrc
+50
+=6
 BUILD/compile-pentium-maintainer
+BitKeeper/etc/config
 BitKeeper/etc/csets
 BitKeeper/etc/csets-in
 BitKeeper/etc/csets-out
+BitKeeper/etc/gone
 BitKeeper/etc/level
 BitKeeper/etc/pushed
 BitKeeper/post-commit
 BitKeeper/post-commit-manual
 BitKeeper/tmp/*
+BitKeeper/tmp/bkr3sAHD
 BitKeeper/tmp/gone
 COPYING
 COPYING.LIB
+Docs/#manual.texi#
 Docs/INSTALL-BINARY
 Docs/Images/myaccess-odbc.txt
 Docs/Images/myaccess.txt
@@ -62,6 +68,7 @@ Docs/internals_toc.html
 Docs/manual.aux
 Docs/manual.cp
 Docs/manual.cps
+Docs/manual.de.log
 Docs/manual.dvi
 Docs/manual.fn
 Docs/manual.fns
@@ -70,6 +77,8 @@ Docs/manual.ky
 Docs/manual.log
 Docs/manual.pdf
 Docs/manual.pg
+Docs/manual.texi.orig
+Docs/manual.texi.rej
 Docs/manual.toc
 Docs/manual.tp
 Docs/manual.txt
@@ -90,11 +99,18 @@ Logs/*
 MIRRORS
 Makefile
 Makefile.in
+Makefile.in'
 PENDING/*
 TAGS
 aclocal.m4
 autom4te-2.53.cache/*
+autom4te-2.53.cache/output.0
+autom4te-2.53.cache/requests
+autom4te-2.53.cache/traces.0
 autom4te.cache/*
+autom4te.cache/output.0
+autom4te.cache/requests
+autom4te.cache/traces.0
 bdb/README
 bdb/btree/btree_auto.c
 bdb/build_unix/*
@@ -140,7 +156,13 @@ bdb/db/db_auto.c
 bdb/dbinc_auto/*.*
 bdb/dbreg/dbreg_auto.c
 bdb/dist/autom4te-2.53.cache/*
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
 bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
 bdb/dist/config.hin
 bdb/dist/configure
 bdb/dist/tags
@@ -219,13 +241,22 @@ bdb/test/include.tcl
 bdb/test/logtrack.list
 bdb/txn/txn_auto.c
 binary/*
+bkpull.log
 bkpull.log*
+bkpull.log.2
+bkpull.log.3
+bkpull.log.4
+bkpull.log.5
+bkpull.log.6
+bkpush.log
 bkpush.log*
 build.log
 build_tags.sh
 client/insert_test
 client/log_event.cc
 client/log_event.h
+client/mf_iocache.c
+client/mf_iocache.cc
 client/mysql
 client/mysqladmin
 client/mysqlbinlog
@@ -236,8 +267,11 @@ client/mysqlmanager-pwgen
 client/mysqlmanagerc
 client/mysqlshow
 client/mysqltest
+client/mysys_priv.h
 client/select_test
 client/ssl_test
+client/thimble
+client/thread_test
 client_test
 cmd-line-utils/libedit/common.h
 cmd-line-utils/libedit/makelist
@@ -251,6 +285,7 @@ configure
 configure.lineno
 core
 core.*
+core.2430
 db-*.*.*
 dbug/dbug_analyze
 dbug/example*.r
@@ -262,8 +297,8 @@ dbug/user.ps
 dbug/user.t
 depcomp
 emacs.h
-extra/comp_err
 extra/charset2html
+extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
 extra/mysql_tzinfo_to_sql
@@ -290,7 +325,13 @@ include/readline/*.h
 include/readline/readline.h
 include/widec.h
 innobase/autom4te-2.53.cache/*
+innobase/autom4te-2.53.cache/output.0
+innobase/autom4te-2.53.cache/requests
+innobase/autom4te-2.53.cache/traces.0
 innobase/autom4te.cache/*
+innobase/autom4te.cache/output.0
+innobase/autom4te.cache/requests
+innobase/autom4te.cache/traces.0
 innobase/configure.lineno
 innobase/conftest.s1
 innobase/conftest.subs
@@ -456,6 +497,15 @@ linked_server_sources
 linked_tools_sources
 locked
 man/*.1
+mit-pthreads/config.flags
+mit-pthreads/include/bits
+mit-pthreads/include/pthread/machdep.h
+mit-pthreads/include/pthread/posix.h
+mit-pthreads/include/sys
+mit-pthreads/machdep.c
+mit-pthreads/pg++
+mit-pthreads/pgcc
+mit-pthreads/syscall.S
 myisam/FT1.MYD
 myisam/FT1.MYI
 myisam/ft_dump
@@ -481,6 +531,9 @@ myisam/test1.MYD
 myisam/test1.MYI
 myisam/test2.MYD
 myisam/test2.MYI
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
 mysql-test/gmon.out
 mysql-test/install_test_db
 mysql-test/mysql-test-run
@@ -504,6 +557,12 @@ mysql.proj
 mysql_priv.h
 mysqld.S
 mysqld.sym
+mysys/#mf_iocache.c#
+mysys/charset2html
+mysys/getopt.c
+mysys/getopt1.c
+mysys/main.cc
+mysys/ste5KbMa
 mysys/test_charset
 mysys/test_dir
 mysys/test_gethwaddr
@@ -626,6 +685,14 @@ ndb/examples/ndbapi_example2/ndbapi_example2
 ndb/examples/ndbapi_example3/ndbapi_example3
 ndb/examples/ndbapi_example5/ndbapi_example5
 ndb/examples/select_all/select_all
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
 ndb/src/common/mgmcommon/printConfig/*.d
 ndb/src/cw/cpcd/ndb_cpcd
 ndb/src/kernel/blocks/backup/restore/ndb_restore
@@ -757,6 +824,7 @@ sql-bench/test-insert
 sql-bench/test-select
 sql-bench/test-transactions
 sql-bench/test-wisconsin
+sql/.gdbinit
 sql/client.c
 sql/gen_lex_hash
 sql/gmon.out
@@ -771,12 +839,24 @@ sql/mysqld
 sql/mysqld-purecov
 sql/mysqld-purify
 sql/mysqld-quantify
+sql/new.cc
 sql/pack.c
+sql/safe_to_cache_query.txt
 sql/share/*.sys
+sql/share/charsets/gmon.out
+sql/share/gmon.out
+sql/share/mysql
+sql/share/norwegian-ny/errmsg.sys
+sql/share/norwegian/errmsg.sys
+sql/sql_select.cc.orig
 sql/sql_yacc.cc
 sql/sql_yacc.h
 sql/sql_yacc.output
+sql/sql_yacc.yy.orig
 sql/test_time
+sql/udf_example.so
+sql_error.cc
+sql_prepare.cc
 stamp-h
 stamp-h.in
 stamp-h1
@@ -868,8 +948,10 @@ tests/client_test
 tests/connect_test
 thread_test
 tmp/*
+tools/my_vsnprintf.c
 tools/mysqlmanager
 tools/mysqlmngd
+tools/mysys_priv.h
 vi.h
 vio/test-ssl
 vio/test-sslclient