Merge

BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up

.bzrignore

-
-*~
 *.a
-aclocal.m4
+*.core
+*.la
+*.lo
+*.o
+*.spec
+*~
+.*.swp
+.deps
+.libs
+.gdb_history
+BitKeeper/etc/config
 BitKeeper/etc/csets
-BitKeeper/etc/csets-in
-BitKeeper/etc/csets-out
-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
-core
-.deps
-Docs/include.texi
 Docs/INSTALL-BINARY
-Docs/manual_a4.ps
+Docs/include.texi
 Docs/manual.aux
 Docs/manual.cp
 Docs/manual.cps
@@ -41,144 +24,71 @@ 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/*
+TAGS
+aclocal.m4
+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
+dbug/user.t
 extra/comp_err
 extra/my_print_defaults
 extra/perror
 extra/replace
 extra/resolveip
-.gdb_history
 heap/hp_test1
 heap/hp_test2
 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/conf_to_src
-libmysql/.libs/libmysqlclient.lai
 libmysql/my_static.h
 libmysql/mysys_priv.h
-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_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/dbug.c
-libmysql_r/default.c
-libmysql_r/dll.c
-libmysql_r/errmsg.c
-libmysql_r/errors.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
-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/mysys_priv.h
-libmysql_r/my_thr_init.c
-libmysql_r/my_write.c
-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
+libmysql_r/*.c
 libtool
 linked_client_sources
 linked_include_sources
 linked_libmysql_r_sources
 linked_libmysql_sources
 linked_server_sources
-*.lo
-Makefile
-Makefile.in
-Makefile.in'
-MIRRORS
+myisam/ft_dump
 myisam/ft_eval
 myisam/ft_test1
 myisam/mi_test1
@@ -188,202 +98,54 @@ myisam/mi_test_all
 myisam/myisamchk
 myisam/myisamlog
 myisam/myisampack
-mysql-test/r/3.23/rpl
-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/r/*.reject
 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/foo/foo.frm
-mysql-test/var/lib/foo/foo.MYD
-mysql-test/var/lib/foo/foo.MYI
-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
-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/test/bar.frm
-mysql-test/var/lib/test/bar.MYD
-mysql-test/var/lib/test/bar.MYI
-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/domain.frm
-mysql-test/var/lib/test/domain.MYD
-mysql-test/var/lib/test/domain.MYI
-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_ck2.frm
-mysql-test/var/lib/test/elt_ck2.MYD
-mysql-test/var/lib/test/elt_ck2.MYI
-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/foo.frm
-mysql-test/var/lib/test/foo.MYD
-mysql-test/var/lib/test/foo.MYI
-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/test2.frm
-mysql-test/var/lib/test/test2.MYD
-mysql-test/var/lib/test/test2.MYI
-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/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/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/foo/foo.frm
-mysql-test/var/slave-data/foo/foo.MYD
-mysql-test/var/slave-data/foo/foo.MYI
-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/db.frm
-mysql-test/var/slave-data/mysql/db.MYD
-mysql-test/var/slave-data/mysql/db.MYI
-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/host.frm
-mysql-test/var/slave-data/mysql/host.MYD
-mysql-test/var/slave-data/mysql/host.MYI
-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/user.frm
-mysql-test/var/slave-data/mysql/user.MYD
-mysql-test/var/slave-data/mysql/user.MYI
-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/choo.frm
-mysql-test/var/slave-data/test/choo.MYD
-mysql-test/var/slave-data/test/choo.MYI
-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/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_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/emails.frm
-mysql-test/var/slave-data/test/emails.MYD
-mysql-test/var/slave-data/test/emails.MYI
-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/test.frm
-mysql-test/var/slave-data/test/test.MYD
-mysql-test/var/slave-data/test/test.MYI
-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/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/tmp/mysql.sock
-mysql-test/var/tmp/README
+mysql-test/var/*
 mysys/test_charset
-mysys/testhash
 mysys/test_thr_alarm
 mysys/test_thr_lock
-.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
+mysys/testhash
 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/mysqld_multi
+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-alter-table
 sql-bench/test-ATIS
+sql-bench/test-alter-table
 sql-bench/test-big-tables
 sql-bench/test-connect
 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/errmsg.sys
-sql/share/norwegian-ny/errmsg.sys
 sql/sql_yacc.cc
 sql/sql_yacc.h
 stamp-h
@@ -403,29 +165,4 @@ 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
-mysql-test/var/lib/test/test3.frm
-mysql-test/var/lib/test/test3.MRG
-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
-BitKeeper/tmp/applied.list
-BitKeeper/tmp/backup.list
-BitKeeper/tmp/backup.sfio
-BitKeeper/tmp/sfile.list
+tags

BitKeeper/etc/gone

+mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
+mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
 mwagner@evoq.home.mwagner.org|mysql-test/var/lib/README|20001009213643|15351|3b652c0f321e1940
 mwagner@evoq.home.mwagner.org|mysql-test/var/log/README|20001009213643|16203|df5481fdbe6e5b6e
 mwagner@evoq.home.mwagner.org|mysql-test/var/run/README|20001009213643|17062|acb305e4c2ed5990
 mwagner@evoq.home.mwagner.org|mysql-test/var/tmp/README|20001009213643|17904|b32d866bfd50e72e
-mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5
-mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305
 sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54

myisammrg/myrg_extra.c

@@ -40,19 +40,9 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function)
       info->current_table=0;
       info->last_used_table=info->open_tables;
     }
-
-    info->records=info->del=info->data_file_length=0;
     for (file=info->open_tables ; file != info->end_table ; file++)
-    {
       if ((error=mi_extra(file->table,function)))
 	save_error=error;
-      file->file_offset=info->data_file_length;
-      info->data_file_length+=file->table->s->state.state.data_file_length;
-      info->records+=file->table->s->state.state.records;
-      info->del+=file->table->s->state.state.del;
-      DBUG_PRINT("info2",("table: %s, offset: 0x%08lx",
-                  file->table->filename,(ulong)file->file_offset));
-    }
   }
   DBUG_RETURN(save_error);
 }

myisammrg/myrg_info.c

 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
@@ -43,17 +43,27 @@ int myrg_status(MYRG_INFO *info,register MYMERGE_INFO *x,int flag)
       (ulong) -1L;
   if (flag != HA_STATUS_POS)
   {
+    MYRG_TABLE *file;
+
+    info->records=info->del=info->data_file_length=0;
+    for (file=info->open_tables ; file != info->end_table ; file++)
+    {
+      file->file_offset=info->data_file_length;
+      info->data_file_length+=file->table->s->state.state.data_file_length;
+      info->records+=file->table->s->state.state.records;
+      info->del+=file->table->s->state.state.del;
+      DBUG_PRINT("info2",("table: %s, offset: 0x%08lx",
+                  file->table->filename,(ulong)file->file_offset));
+    }
     x->records	 = info->records;
     x->deleted	 = info->del;
     x->data_file_length = info->data_file_length;
     x->reclength  = info->reclength;
+    x->options	 = info->options;
     if (current_table)
       x->errkey  = current_table->table->errkey;
     else
-    {						/* No tables in MRG */
       x->errkey=0;
-    }
-    x->options	 = info->options;
   }
   DBUG_RETURN(0);
 }

sql/sql_base.cc

@@ -740,7 +740,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
     }
     table->prev->next=table->next;		/* Remove from unused list */
     table->next->prev=table->prev;
-    table->file->reset();
   }
   else
   {