Merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged

1 files changed, 270 insertions, 1 deletions

diff --git a/.bzrignore b/.bzrignore
index bec7c537864..636ca9d50f5 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,4 @@
+
 *.a
 *.core
 *.la
@@ -7,11 +8,20 @@
 *~
 .*.swp
 .deps
-.libs
 .gdb_history
+.libs
+.o
 BitKeeper/etc/config
 BitKeeper/etc/csets
+BitKeeper/etc/csets-in
+BitKeeper/etc/csets-out
+BitKeeper/etc/gone
 BitKeeper/etc/pushed
+BitKeeper/tmp/CONTENTS
+BitKeeper/tmp/bkOF1wtJ
+BitKeeper/tmp/gone
+BitKeeper/tmp/patch
+BitKeeper/tmp/pid
 COPYING
 COPYING.LIB
 Docs/INSTALL-BINARY
@@ -41,8 +51,18 @@ Makefile
 Makefile.in
 Makefile.in'
 PENDING/*
+PENDING/2000-10-11.01
+PENDING/2000-10-11.02
+PENDING/2000-10-11.03
+PENDING/2000-10-11.04
+PENDING/2000-10-11.05
+PENDING/2000-10-11.06
+PENDING/2000-10-25.01
+PENDING/2000-10-25.02
+PENDING/2000-11-17.01
 TAGS
 aclocal.m4
+client/.mysqladmin.c.swp
 client/insert_test
 client/mysql
 client/mysqladmin
@@ -68,6 +88,7 @@ extra/replace
 extra/resolveip
 heap/hp_test1
 heap/hp_test2
+include/.my_sys.h.swp
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
@@ -78,10 +99,103 @@ isam/test1
 isam/test2
 isam/test3
 libmysql/*.c
+libmysql/.libs/libmysqlclient.lai
 libmysql/conf_to_src
 libmysql/my_static.h
 libmysql/mysys_priv.h
 libmysql_r/*.c
+libmysql_r/.libs/libmysqlclient_r.lai
+libmysql_r/acconfig.h
+libmysql_r/array.c
+libmysql_r/bchange.c
+libmysql_r/bmove.c
+libmysql_r/bmove_upp.c
+libmysql_r/charset.c
+libmysql_r/conf_to_src
+libmysql_r/conf_to_src.c
+libmysql_r/ctype-big5.c
+libmysql_r/ctype-czech.c
+libmysql_r/ctype-euc_kr.c
+libmysql_r/ctype-gb2312.c
+libmysql_r/ctype-gbk.c
+libmysql_r/ctype-sjis.c
+libmysql_r/ctype-tis620.c
+libmysql_r/ctype-ujis.c
+libmysql_r/ctype.c
+libmysql_r/ctype_autoconf.c
+libmysql_r/ctype_extra_sources.c
+libmysql_r/dbug.c
+libmysql_r/default.c
+libmysql_r/dll.c
+libmysql_r/errmsg.c
+libmysql_r/errors.c
+libmysql_r/get_password.c
+libmysql_r/getopt.c
+libmysql_r/getopt1.c
+libmysql_r/getvar.c
+libmysql_r/hash.c
+libmysql_r/int2str.c
+libmysql_r/is_prefix.c
+libmysql_r/libmysql.c
+libmysql_r/list.c
+libmysql_r/llstr.c
+libmysql_r/longlong2str.c
+libmysql_r/mf_casecnv.c
+libmysql_r/mf_dirname.c
+libmysql_r/mf_fn_ext.c
+libmysql_r/mf_format.c
+libmysql_r/mf_loadpath.c
+libmysql_r/mf_pack.c
+libmysql_r/mf_path.c
+libmysql_r/mf_tempfile.c
+libmysql_r/mf_unixpath.c
+libmysql_r/mf_wcomp.c
+libmysql_r/mulalloc.c
+libmysql_r/my_alloc.c
+libmysql_r/my_compress.c
+libmysql_r/my_create.c
+libmysql_r/my_delete.c
+libmysql_r/my_div.c
+libmysql_r/my_error.c
+libmysql_r/my_fopen.c
+libmysql_r/my_fstream.c
+libmysql_r/my_getwd.c
+libmysql_r/my_init.c
+libmysql_r/my_lib.c
+libmysql_r/my_malloc.c
+libmysql_r/my_messnc.c
+libmysql_r/my_net.c
+libmysql_r/my_once.c
+libmysql_r/my_open.c
+libmysql_r/my_pthread.c
+libmysql_r/my_read.c
+libmysql_r/my_realloc.c
+libmysql_r/my_static.c
+libmysql_r/my_static.h
+libmysql_r/my_thr_init.c
+libmysql_r/my_write.c
+libmysql_r/mysys_priv.h
+libmysql_r/net.c
+libmysql_r/password.c
+libmysql_r/safemalloc.c
+libmysql_r/str2int.c
+libmysql_r/strcend.c
+libmysql_r/strcont.c
+libmysql_r/strend.c
+libmysql_r/strfill.c
+libmysql_r/string.c
+libmysql_r/strinstr.c
+libmysql_r/strmake.c
+libmysql_r/strmov.c
+libmysql_r/strnlen.c
+libmysql_r/strnmov.c
+libmysql_r/strto.c
+libmysql_r/strtoll.c
+libmysql_r/strtoull.c
+libmysql_r/strxmov.c
+libmysql_r/thr_mutex.c
+libmysql_r/typelib.c
+libmysql_r/violite.c
 libtool
 linked_client_sources
 linked_include_sources
@@ -99,8 +213,160 @@ myisam/myisamchk
 myisam/myisamlog
 myisam/myisampack
 mysql-test/r/*.reject
+mysql-test/r/3.23/rpl
+mysql-test/r/3.23/rpl.reject
+mysql-test/r/3.23/rpl000001.b.result.reject
+mysql-test/r/3.23/rpl000012.result.reject
+mysql-test/r/3.23/sel000004.result.reject
+mysql-test/rpl000011.test
 mysql-test/share/mysql
 mysql-test/var/*
+mysql-test/var/lib/bar/bar.MYD
+mysql-test/var/lib/bar/bar.MYI
+mysql-test/var/lib/bar/bar.frm
+mysql-test/var/lib/foo/foo.MYD
+mysql-test/var/lib/foo/foo.MYI
+mysql-test/var/lib/foo/foo.frm
+mysql-test/var/lib/log.txt
+mysql-test/var/lib/mysql
+mysql-test/var/lib/mysql-bin.001
+mysql-test/var/lib/mysql-bin.002
+mysql-test/var/lib/mysql-bin.003
+mysql-test/var/lib/mysql-bin.004
+mysql-test/var/lib/mysql-bin.005
+mysql-test/var/lib/mysql-bin.006
+mysql-test/var/lib/mysql-bin.007
+mysql-test/var/lib/mysql-bin.008
+mysql-test/var/lib/mysql-bin.index
+mysql-test/var/lib/mysql-slow.log
+mysql-test/var/lib/mysql/*
+mysql-test/var/lib/test/bar.MYD
+mysql-test/var/lib/test/bar.MYI
+mysql-test/var/lib/test/bar.frm
+mysql-test/var/lib/test/choo.MYD
+mysql-test/var/lib/test/choo.MYI
+mysql-test/var/lib/test/choo.frm
+mysql-test/var/lib/test/domain.MYD
+mysql-test/var/lib/test/domain.MYI
+mysql-test/var/lib/test/domain.frm
+mysql-test/var/lib/test/elt_ck1.MYD
+mysql-test/var/lib/test/elt_ck1.MYI
+mysql-test/var/lib/test/elt_ck1.frm
+mysql-test/var/lib/test/elt_ck2.MYD
+mysql-test/var/lib/test/elt_ck2.MYI
+mysql-test/var/lib/test/elt_ck2.frm
+mysql-test/var/lib/test/emails.MYD
+mysql-test/var/lib/test/emails.MYI
+mysql-test/var/lib/test/emails.frm
+mysql-test/var/lib/test/foo.MYD
+mysql-test/var/lib/test/foo.MYI
+mysql-test/var/lib/test/foo.frm
+mysql-test/var/lib/test/t.MYD
+mysql-test/var/lib/test/t.MYI
+mysql-test/var/lib/test/t.frm
+mysql-test/var/lib/test/test.MYD
+mysql-test/var/lib/test/test.MYI
+mysql-test/var/lib/test/test.frm
+mysql-test/var/lib/test/test1.MYD
+mysql-test/var/lib/test/test1.MYI
+mysql-test/var/lib/test/test1.frm
+mysql-test/var/lib/test/test2.MYD
+mysql-test/var/lib/test/test2.MYI
+mysql-test/var/lib/test/test2.frm
+mysql-test/var/lib/test/test3.MRG
+mysql-test/var/lib/test/test3.frm
+mysql-test/var/lib/test/words.MYD
+mysql-test/var/lib/test/words.MYI
+mysql-test/var/lib/test/words.frm
+mysql-test/var/lib/test/words1.MYD
+mysql-test/var/lib/test/words1.MYI
+mysql-test/var/lib/test/words1.frm
+mysql-test/var/lib/test/x.MYD
+mysql-test/var/lib/test/x.MYI
+mysql-test/var/lib/test/x.frm
+mysql-test/var/log/mysqld-slave.err
+mysql-test/var/log/mysqld-slave.log
+mysql-test/var/log/mysqld.err
+mysql-test/var/log/mysqld.log
+mysql-test/var/run/mysqld.pid
+mysql-test/var/slave-data/bar/bar.MYD
+mysql-test/var/slave-data/bar/bar.MYI
+mysql-test/var/slave-data/bar/bar.frm
+mysql-test/var/slave-data/foo/foo.MYD
+mysql-test/var/slave-data/foo/foo.MYI
+mysql-test/var/slave-data/foo/foo.frm
+mysql-test/var/slave-data/master.info
+mysql-test/var/slave-data/mysql-bin.001
+mysql-test/var/slave-data/mysql-bin.002
+mysql-test/var/slave-data/mysql-bin.003
+mysql-test/var/slave-data/mysql-bin.004
+mysql-test/var/slave-data/mysql-bin.005
+mysql-test/var/slave-data/mysql-bin.006
+mysql-test/var/slave-data/mysql-bin.007
+mysql-test/var/slave-data/mysql-bin.008
+mysql-test/var/slave-data/mysql-bin.009
+mysql-test/var/slave-data/mysql-bin.010
+mysql-test/var/slave-data/mysql-bin.011
+mysql-test/var/slave-data/mysql-bin.012
+mysql-test/var/slave-data/mysql-bin.013
+mysql-test/var/slave-data/mysql-bin.014
+mysql-test/var/slave-data/mysql-bin.index
+mysql-test/var/slave-data/mysql/columns_priv.MYD
+mysql-test/var/slave-data/mysql/columns_priv.MYI
+mysql-test/var/slave-data/mysql/columns_priv.frm
+mysql-test/var/slave-data/mysql/db.MYD
+mysql-test/var/slave-data/mysql/db.MYI
+mysql-test/var/slave-data/mysql/db.frm
+mysql-test/var/slave-data/mysql/func.MYD
+mysql-test/var/slave-data/mysql/func.MYI
+mysql-test/var/slave-data/mysql/func.frm
+mysql-test/var/slave-data/mysql/host.MYD
+mysql-test/var/slave-data/mysql/host.MYI
+mysql-test/var/slave-data/mysql/host.frm
+mysql-test/var/slave-data/mysql/tables_priv.MYD
+mysql-test/var/slave-data/mysql/tables_priv.MYI
+mysql-test/var/slave-data/mysql/tables_priv.frm
+mysql-test/var/slave-data/mysql/user.MYD
+mysql-test/var/slave-data/mysql/user.MYI
+mysql-test/var/slave-data/mysql/user.frm
+mysql-test/var/slave-data/test/bar.MYD
+mysql-test/var/slave-data/test/bar.MYI
+mysql-test/var/slave-data/test/bar.frm
+mysql-test/var/slave-data/test/choo.MYD
+mysql-test/var/slave-data/test/choo.MYI
+mysql-test/var/slave-data/test/choo.frm
+mysql-test/var/slave-data/test/domain.MYD
+mysql-test/var/slave-data/test/domain.MYI
+mysql-test/var/slave-data/test/domain.frm
+mysql-test/var/slave-data/test/elt_ck1.MYD
+mysql-test/var/slave-data/test/elt_ck1.MYI
+mysql-test/var/slave-data/test/elt_ck1.frm
+mysql-test/var/slave-data/test/elt_ck2.MYD
+mysql-test/var/slave-data/test/elt_ck2.MYI
+mysql-test/var/slave-data/test/elt_ck2.frm
+mysql-test/var/slave-data/test/emails.MYD
+mysql-test/var/slave-data/test/emails.MYI
+mysql-test/var/slave-data/test/emails.frm
+mysql-test/var/slave-data/test/foo.MYD
+mysql-test/var/slave-data/test/foo.MYI
+mysql-test/var/slave-data/test/foo.frm
+mysql-test/var/slave-data/test/t.MYD
+mysql-test/var/slave-data/test/t.MYI
+mysql-test/var/slave-data/test/t.frm
+mysql-test/var/slave-data/test/test.MYD
+mysql-test/var/slave-data/test/test.MYI
+mysql-test/var/slave-data/test/test.frm
+mysql-test/var/slave-data/test/words.MYD
+mysql-test/var/slave-data/test/words.MYI
+mysql-test/var/slave-data/test/words.frm
+mysql-test/var/slave-data/test/words1.MYD
+mysql-test/var/slave-data/test/words1.MYI
+mysql-test/var/slave-data/test/words1.frm
+mysql-test/var/slave-data/test/x.MYD
+mysql-test/var/slave-data/test/x.MYI
+mysql-test/var/slave-data/test/x.frm
+mysql-test/var/tmp/README
+mysql-test/var/tmp/mysql.sock
 mysys/test_charset
 mysys/test_thr_alarm
 mysys/test_thr_lock
@@ -141,11 +407,14 @@ sql-bench/test-create
 sql-bench/test-insert
 sql-bench/test-select
 sql-bench/test-wisconsin
+sql/.gdb_history
 sql/gen_lex_hash
 sql/lex_hash.h
 sql/mini_client_errors.c
 sql/mysqlbinlog
 sql/mysqld
+sql/share/norwegian-ny/errmsg.sys
+sql/share/norwegian/errmsg.sys
 sql/sql_yacc.cc
 sql/sql_yacc.h
 stamp-h