BitKeeper/etc/ignore:
  added BitKeeper/tmp/*
Docs/manual.texi:
  SCCS merged

to keep in a repository

Docs/manual.texi:
  change note stuff

myisam/mi_check.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

Fixed bug in DISTINCT


Docs/manual.texi:
  Updated Changelog
  Cleaned up adding character sets
merge/open.c:
  skip comments
myisam/mi_check.c:
  Fixed bug when sorting index on Windows
myisammrg/myrg_info.c:
  Use only portable printf arguments
myisammrg/myrg_rrnd.c:
  Use only portable printf arguments
mysql-test/r/distinct.result:
  Added test case for bug in distinct
mysql-test/r/merge.result:
  Added test for ALTER TABLE
mysql-test/t/distinct.test:
  Added test case for bug in distinct
mysql-test/t/merge.test:
  Added test for ALTER TABLE
sql-bench/crash-me.sh:
  Fixed portability issues
sql/ha_myisammrg.cc:
  Fixed for ALTER TABLE on MERGE tables
sql/item_sum.cc:
  Fixed bug in DISTINCT
sql/sql_db.cc:
  Added test of namelen in check_db_name
sql/sql_select.cc:
  Fixed bug in DISTINCT
sql/sql_select.h:
  Fixed bug in DISTINCT
sql/sql_table.cc:
  Fixed ALTER TABLE on MERGE tables
sql/table.cc:
  Added test of namelen in check_db_name
sql/table.h:
  Fixed ALTER TABLE on MERGE tables

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

libmysql/errmsg.c:
  buffer overflow in libmysqlclient fixed

    re-added Jeremy's merged out note
    updated changes section with recent bug fix info


Docs/manual.texi:
  re-added Jeremy's merged out note
  updated changes section with recent bug fix info

sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  Merged. Need to re-add Jeremy's line

updated manual about table lock counter
fixed coredump in DROP DATABASE with long bogus name by non-root user
fixed bug in handling STOP immediately after ROTATE
added test case for buffer overrun on DROP DATABASE by non-root user
added test case for the STOP bug in replication


Docs/manual.texi:
  updates for Table_locks_immediate and Table_locks_waited
include/thr_lock.h:
  fixes suggested by Monty to lock counts
mysql-test/r/status.result:
  clean up of result for changes in the test case
mysql-test/t/status.test:
  make it produce the same results if the had been some activity on the server already
mysys/thr_lock.c:
  fixes suggested by Monty
sql/mysqld.cc:
  fixes suggested by Monty
sql/slave.cc:
  fixed bug in processing STOP event after rotate
sql/sql_base.cc:
  fixes suggested by Monty
sql/sql_parse.cc:
  fixed coredump in drop database with long name by a non-root user
sql/sql_repl.cc:
  better status message

mi_check.c	fix for empty FULLTEXT index
manual.texi	fulltext finetuning 50% limit issue modified


Docs/manual.texi:
  fulltext finetuning 50% limit issue modified
myisam/mi_check.c:
  fix for empty FULLTEXT index
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added notes on OpenBSD 2.8

Docs/manual.texi:
  Added ChangeLog entry for --temp-pool

sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
Docs/manual.texi:
  merged

created to use a small set of filenames, to try and avoid problems
in the Linux kernel.


mysys/Makefile.am:
  Added my_bitmap.c
mysys/my_init.c:
  my_bitmap code added
mysys/mysys_priv.h:
  my_bitmap
sql/mysql_priv.h:
  temp pool stuff.
sql/mysqld.cc:
  --temp-pool option added
sql/sql_select.cc:
  temp pool stuff
sql/table.h:
  temp pool

Table_locks_immediate


mysys/thr_lock.c:
  count locks
sql/mysqld.cc:
  count locks
sql/sql_base.cc:
  count locks

Docs/manual.texi:
  minor edits to change notes.

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Changed TCX -> MySQL AB
configure.in:
  New version
include/my_sys.h:
  Fixes for OS2
ltconfig:
  Fixes for OS2
ltmain.sh:
  Fixes for OS2
mit-pthreads/net/net_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/proto_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/res_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/serv_internal.h:
  Fixes for OPENBSD
myisammrg/myrg_open.c:
  MERGE didn't work on Windows
mysys/my_getwd.c:
  Fixes for OS2
sql/field.cc:
  cleanup
sql/field.h:
  Fix for new SCO compiler
sql/ha_berkeley.cc:
  Cleanup
sql/ha_berkeley.h:
  Portability fix
sql/item_sum.h:
  Fix for new SCO compiler
sql/log.cc:
  Fixes for OS2
sql/log_event.h:
  Fixes for OS2
sql/mysqld.cc:
  Fixes for OS2
sql/net_serv.cc:
  Fixes for OS2
sql/sql_analyse.h:
  Fix for new SCO compiler
sql/sql_class.h:
  Fix for new SCO compiler
sql/sql_map.h:
  Fix for new SCO compiler
sql/sql_repl.cc:
  cleanup
sql/sql_string.h:
  Fix for new SCO compiler
sql/sql_table.cc:
  cleanup
strings/longlong2str-x86.s:
  Fixes for openbsd

into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged

    updates for new code
sql/mysqld.cc
    catch SIGBUS and SIGILL
    print query and connection id on coredump if possible


Docs/manual.texi:
  updates for new code
sql/mysqld.cc:
  catch SIGBUS and SIGILL
  print query and connection id on coredump if possible

Docs/manual.texi:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

Changed 'static inline' to 'inline' for SCO new's compiler


Docs/manual.texi:
  Lots of changes in "Debugging a MySQL server" and in Log files handling
mysys/hash.c:
  Changed 'static inline' to 'inline'
sql/hostname.cc:
  Changed 'static inline' to 'inline'
sql/item.cc:
  Changed 'static inline' to 'inline'
sql/net_serv.cc:
  Changed 'static inline' to 'inline'
sql/password.c:
  Changed 'static inline' to 'inline'
sql/slave.cc:
  Changed 'static inline' to 'inline'
sql/sql_acl.cc:
  Changed 'static inline' to 'inline'
sql/sql_base.cc:
  Changed mysql_list_field() to convert field names again
sql/sql_parse.cc:
  Changed 'static inline' to 'inline'
sql/sql_repl.cc:
  fixed typo

Docs/manual.texi:
  ChangeLog entry added.

Docs/manual.texi:
  New empty News-3.23.33 section added.

fixed sync bugs in three test cases
added offset argument to sync_with_master to mysqltest to be able to fix sync bugs
added a test case for slave startup with existing master.info
expanded mysql-test-run.sh to be able to run pre-start shell script initializations


client/mysqltest.c:
  added offset argument to sync_with_master
mysql-test/mysql-test-run.sh:
  added option to run master or slave initialization shell script
mysql-test/r/rpl000016.result:
  fixed bug in test case
mysql-test/t/rpl000012.test:
  fixed syncronization bug
mysql-test/t/rpl000013.test:
  fixed sync bug
mysql-test/t/rpl000016.test:
  fixed ambiguous show slave status.
sql/slave.cc:
  fixed bug that broke slave server start with existing master.info,
  Monty's optimization was not chopping off newline from logname.

into mysql.sashanet.com:/home/sasha/src/bk/mysql

slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start - 
this is needed to recover from broken replication when the next log
event(s) should just be skipped.
Rotate binlogs when max_binlog_size is reached


include/my_sys.h:
  added my_snprintf()
include/mysqld_error.h:
  more error messages
mysql-test/r/rpl000014.result:
  updated results for new SHOW SLAVE STATUS format
mysql-test/r/rpl000015.result:
  update for SHOW SLAVE STATUS
mysql-test/r/rpl000016.result:
  update for additions to the test
mysql-test/t/rpl000016.test:
  test max_binlog_size and slave_skip_counter
mysys/my_vsnprintf.c:
  added my_snprintf()
sql/gen_lex_hash.cc:
  old values could not do it
sql/lex.h:
  updates for SQL_SLAVE_SKIP_COUNTER
sql/log.cc:
  rotate binlogs when max_binlog_size is reached
sql/mysqld.cc:
  added max_binlog_size
sql/share/czech/errmsg.txt:
  new errors
sql/share/danish/errmsg.txt:
  new errors
sql/share/dutch/errmsg.txt:
  new errors
sql/share/english/errmsg.txt:
  new errors
sql/share/estonian/errmsg.txt:
  new errors
sql/share/french/errmsg.txt:
  new errors
sql/share/german/errmsg.txt:
  new errors
sql/share/greek/errmsg.txt:
  new errors
sql/share/hungarian/errmsg.txt:
  new errors
sql/share/italian/errmsg.txt:
  new errors
sql/share/japanese/errmsg.txt:
  new errors
sql/share/korean/errmsg.txt:
  new errors
sql/share/norwegian-ny/errmsg.txt:
  new errors
sql/share/norwegian/errmsg.txt:
  new errors
sql/share/polish/errmsg.txt:
  new errors
sql/share/portuguese/errmsg.txt:
  new errors
sql/share/romanian/errmsg.txt:
  new errors
sql/share/russian/errmsg.txt:
  new errors, translated untranslated messages
sql/share/slovak/errmsg.txt:
  new errors
sql/share/spanish/errmsg.txt:
  new errors
sql/share/swedish/errmsg.txt:
  new errors
sql/slave.cc:
  updates for slave_skip_counter and extension to show slave status
sql/slave.h:
  slave_skip_counter
sql/sql_repl.cc:
  use error messages from errmsg.txt
sql/sql_yacc.yy:
  skip_slave_counter

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

client/mysqltest.c:
  fixed bug in reap command
mysql-test/r/backup.result:
  update to backup test
mysql-test/t/backup.test:
  test to see if lock tables /unlock tables will cause a problem
mysql-test/t/rpl000016.test:
  fixed syncronization problem between master and slave

mysys/mf_tempfile.c:
  Corrected misnamed DBUG_ENTER

Docs/manual.texi:
  clean up recent change notes

Added free of io_cache when using ALTER TABLE ... ORDER BY


Docs/manual.texi:
  Updated from user comments
sql/ha_berkeley.cc:
  Fixed wrong cast
sql/hostname.cc:
  Added new mutex for hostname lookup
sql/sql_table.cc:
  Added free of io_cache when using ALTER TABLE ... ORDER BY

added test/sanity check for master_pos_wait()


mysql-test/r/rpl000016.result:
  do show slave status to test master_pos_wait()
mysql-test/t/rpl000001.test:
  no sleep
mysql-test/t/rpl000002.test:
  no sleep
mysql-test/t/rpl000003.test:
  no sleep
mysql-test/t/rpl000007.test:
  !sleep
mysql-test/t/rpl000008.test:
  !sleep
mysql-test/t/rpl000009.test:
  no sleep
mysql-test/t/rpl000010.test:
  no sleep
mysql-test/t/rpl000011.test:
  no sleep
mysql-test/t/rpl000012.test:
  no sleep
mysql-test/t/rpl000013.test:
  no sleep
mysql-test/t/rpl000014.test:
  no sleep
mysql-test/t/rpl000015.test:
  no sleep
mysql-test/t/rpl000016.test:
  no sleep, test that master_pos_wait() works right
sql/slave.cc:
  fixed bug in master_pos_wait()

into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/log_event.h:
  Auto merged

sql/log_event.h:
  fixed compiler error

Made test more reliable on slow machines


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Made --silent more silent
include/my_pthread.h:
  Removed warning on OSF1
mysql-test/install_test_db.sh:
  Allow connections from 127.0.0.1
mysql-test/mysql-test-run.sh:
  Use mysqladmin ping to test if server is up
mysql-test/r/rpl000015.result:
  Added sleep to make results repeatable
mysql-test/t/rpl000015.test:
  Added sleep to make results repeatable
mysql-test/t/rpl000016.test:
  Added sleep to make results repeatable
sql/sql_repl.cc:
  added DBUG entry
sql/sql_table.cc:
  Removed comparison of virtual functions as this didn't work on
  Compaq C++ on OSF1