Merge

1 files changed, 121 insertions, 115 deletions

diff --git a/.bzrignore b/.bzrignore
index d20714fed74..24581b5b5b7 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,13 +1,7 @@
 
-*.a
-*.la
-*.lo
-*.o
-*.spec
 *~
-.deps
-.gdb_history
-.o
+*.a
+aclocal.m4
 BitKeeper/etc/csets
 BitKeeper/etc/csets-in
 BitKeeper/etc/csets-out
@@ -15,10 +9,30 @@ BitKeeper/etc/gone
 BitKeeper/etc/pushed
 BitKeeper/tmp/bkOF1wtJ
 BitKeeper/tmp/gone
+client/insert_test
+client/mysql
+client/mysqladmin
+client/.mysqladmin.c.swp
+client/mysqldump
+client/mysqlimport
+client/mysqlshow
+client/mysqltest
+client/select_test
+client/thimble
+client/thread_test
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
 COPYING
 COPYING.LIB
-Docs/INSTALL-BINARY
+core
+.deps
 Docs/include.texi
+Docs/INSTALL-BINARY
+Docs/manual_a4.ps
 Docs/manual.aux
 Docs/manual.cp
 Docs/manual.cps
@@ -27,75 +41,41 @@ Docs/manual.fn
 Docs/manual.fns
 Docs/manual.html
 Docs/manual.ky
+Docs/manual_letter.ps
 Docs/manual.log
 Docs/manual.pdf
 Docs/manual.pg
 Docs/manual.toc
+Docs/manual_toc.html
 Docs/manual.tp
 Docs/manual.txt
 Docs/manual.vr
-Docs/manual_a4.ps
-Docs/manual_letter.ps
-Docs/manual_toc.html
 Docs/mysql.info
-INSTALL-SOURCE
-MIRRORS
-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
-client/mysqldump
-client/mysqlimport
-client/mysqlshow
-client/mysqltest
-client/select_test
-client/thimble
-client/thread_test
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-core
 extra/comp_err
 extra/my_print_defaults
 extra/perror
 extra/replace
 extra/resolveip
+.gdb_history
 heap/hp_test1
 heap/hp_test2
-include/.my_sys.h.swp
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
+include/.my_sys.h.swp
+INSTALL-SOURCE
 isam/isamchk
 isam/isamlog
 isam/pack_isam
 isam/test1
 isam/test2
 isam/test3
+*.la
 libmysql/*.c
-libmysql/.libs/libmysqlclient.lai
 libmysql/conf_to_src
+libmysql/.libs/libmysqlclient.lai
 libmysql/my_static.h
 libmysql/mysys_priv.h
-libmysql_r/.libs/libmysqlclient_r.lai
 libmysql_r/acconfig.h
 libmysql_r/array.c
 libmysql_r/bchange.c
@@ -104,29 +84,31 @@ libmysql_r/bmove_upp.c
 libmysql_r/charset.c
 libmysql_r/conf_to_src
 libmysql_r/conf_to_src.c
+libmysql_r/ctype_autoconf.c
 libmysql_r/ctype-big5.c
+libmysql_r/ctype.c
 libmysql_r/ctype-czech.c
 libmysql_r/ctype-euc_kr.c
+libmysql_r/ctype_extra_sources.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/getopt.c
+libmysql_r/get_password.c
 libmysql_r/getvar.c
+libmysql_r/hash.c
 libmysql_r/int2str.c
 libmysql_r/is_prefix.c
 libmysql_r/libmysql.c
+libmysql_r/.libs/libmysqlclient_r.lai
 libmysql_r/list.c
 libmysql_r/llstr.c
 libmysql_r/longlong2str.c
@@ -162,9 +144,9 @@ libmysql_r/my_read.c
 libmysql_r/my_realloc.c
 libmysql_r/my_static.c
 libmysql_r/my_static.h
+libmysql_r/mysys_priv.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
@@ -192,6 +174,11 @@ linked_include_sources
 linked_libmysql_r_sources
 linked_libmysql_sources
 linked_server_sources
+*.lo
+Makefile
+Makefile.in
+Makefile.in'
+MIRRORS
 myisam/ft_eval
 myisam/ft_test1
 myisam/mi_test1
@@ -202,20 +189,21 @@ myisam/myisamchk
 myisam/myisamlog
 myisam/myisampack
 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/rpl.reject
 mysql-test/r/3.23/sel000004.result.reject
 mysql-test/rpl000011.test
 mysql-test/share/mysql
+mysql-test/var/lib/bar/bar.frm
 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.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/*
 mysql-test/var/lib/mysql-bin.001
 mysql-test/var/lib/mysql-bin.002
 mysql-test/var/lib/mysql-bin.003
@@ -226,149 +214,162 @@ 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.frm
 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.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.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.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.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.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.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.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.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/words.MYD
-mysql-test/var/lib/test/words.MYI
-mysql-test/var/lib/test/words.frm
+mysql-test/var/lib/test/test.frm
+mysql-test/var/lib/test/test.MYD
+mysql-test/var/lib/test/test.MYI
+mysql-test/var/lib/test/t.frm
+mysql-test/var/lib/test/t.MYD
+mysql-test/var/lib/test/t.MYI
+mysql-test/var/lib/test/words1.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/words.frm
+mysql-test/var/lib/test/words.MYD
+mysql-test/var/lib/test/words.MYI
+mysql-test/var/lib/test/x.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/log/mysqld-slave.err
+mysql-test/var/log/mysqld-slave.log
 mysql-test/var/run/mysqld.pid
+mysql-test/var/slave-data/bar/bar.frm
 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.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/columns_priv.frm
 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.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.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.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.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.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.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.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.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.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.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.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.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.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/t.frm
+mysql-test/var/slave-data/test/t.MYD
+mysql-test/var/slave-data/test/t.MYI
+mysql-test/var/slave-data/test/words1.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/words.frm
+mysql-test/var/slave-data/test/words.MYD
+mysql-test/var/slave-data/test/words.MYI
+mysql-test/var/slave-data/test/x.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
+mysql-test/var/tmp/README
 mysys/test_charset
+mysys/testhash
 mysys/test_thr_alarm
 mysys/test_thr_lock
-mysys/testhash
+.o
+*.o
+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
 regex/re
-repl-tests/test-repl-ts/repl-timestamp.master.reject
 repl-tests/test-repl/foo-dump-slave.master.
 repl-tests/test-repl/sum-wlen-slave.master.
 repl-tests/test-repl/sum-wlen-slave.master.re
 repl-tests/test-repl/sum-wlen-slave.master.reje
+repl-tests/test-repl-ts/repl-timestamp.master.reject
 scripts/make_binary_distribution
 scripts/msql2mysql
+scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz
+scripts/mysqlaccess
+scripts/mysqlbug
 scripts/mysql_config
 scripts/mysql_convert_table_format
+scripts/mysqldumpslow
 scripts/mysql_find_rows
 scripts/mysql_fix_privilege_tables
+scripts/mysqlhotcopy
 scripts/mysql_install_db
 scripts/mysql_setpermission
 scripts/mysql_zap
-scripts/mysqlaccess
-scripts/mysqlbug
-scripts/mysqldumpslow
-scripts/mysqlhotcopy
 scripts/safe_mysqld
+*.spec
 sql-bench/bench-init.pl
 sql-bench/compare-results
 sql-bench/copy-db
 sql-bench/crash-me
 sql-bench/run-all-tests
 sql-bench/server-cfg
-sql-bench/test-ATIS
 sql-bench/test-alter-table
+sql-bench/test-ATIS
 sql-bench/test-big-tables
 sql-bench/test-connect
 sql-bench/test-create
@@ -381,8 +382,8 @@ 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/share/norwegian-ny/errmsg.sys
 sql/sql_yacc.cc
 sql/sql_yacc.h
 stamp-h
@@ -402,3 +403,8 @@ support-files/mysql-3.23.29-gamma.spec
 support-files/mysql-log-rotate
 support-files/mysql.server
 support-files/mysql.spec
+TAGS
+BitKeeper/etc/config
+BitKeeper/tmp/CONTENTS
+BitKeeper/tmp/patch
+BitKeeper/tmp/pid