support-files/Makefile.am:
  Auto merged

into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  'Auto converge'

mysql.server is a script, not data.


Docs/Makefile.am:
  Use INSTALL_DATA instead of cp
libmysql/Makefile.am:
  Use INSTALL_DATA instead of cp
mysql-test/Makefile.am:
  Use INSTALL_DATA instead of cp
sql-bench/Makefile.am:
  Use INSTALL_DATA instead of cp
support-files/Makefile.am:
  mysql.server is a script, not data.

Docs/manual.texi:
  Auto merged

configure.in:
  SCO portability fixes.
  Removed the LIBS_BEFORE_SOCKET hack dead code.
ltconfig:
  SCO portability fixes.
ltmain.sh:
  SCO portability fixes.

Changed TRUNCATE table_name -> TRUNCATE TABLE table_name


Docs/manual.texi:
  Changed TRUNCATE table_name -> TRUNCATE TABLE table_name
client/mysql.cc:
  Don't crash when using -q with long fields
include/my_net.h:
  Portability fix
mysql-test/t/truncate.test:
  Changed TRUNCATE table_name -> TRUNCATE TABLE table_name
readline/input.c:
  Portability fix
scripts/make_binary_distribution.sh:
  Portability fix
sql-bench/crash-me.sh:
  Portability fix
sql/mini_client.cc:
  Portability fix
sql/mysqld.cc:
  cleanup
sql/share/dutch/errmsg.txt:
  Fixed typo
sql/share/english/errmsg.txt:
  Fixed typo
sql/share/greek/errmsg.txt:
  Fixed typo
sql/share/hungarian/errmsg.txt:
  Fixed typo
sql/share/italian/errmsg.txt:
  New translated messages
sql/share/portuguese/errmsg.txt:
  Fixed typo
sql/share/romanian/errmsg.txt:
  Fixed typo
sql/share/slovak/errmsg.txt:
  Fixed typo
sql/share/spanish/errmsg.txt:
  Fixed typo
sql/sql_yacc.yy:
  Changed TRUNCATE table_name -> TRUNCATE TABLE table_name
support-files/Makefile.am:
  Portability fix

manual.texi	REGEXP became case insensitive.


Docs/manual.texi:
  fix tutorial examples that become incorrect when
  REGEXP became case insensitive.

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


Docs/manual.texi:
  Auto merged

Clean up $(INSTALL_DATA) use in sql/share.


mysql-test/Makefile.am:
  Use $(INSTALL_DATA) instead of cp -p.
sql-bench/Makefile.am:
  Use $(INSTALL_DATA) instead of cp -p.
sql/share/Makefile.am:
  Use $(INSTALL_DATA), instead of for loop + basename.

Docs/manual.texi:
  merged

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


sql/table.cc:
  Auto merged

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


sql/table.cc:
  Auto merged

fix to make table.cc compile


mysql-test/mysql-test-run.sh:
  explictily state empty password for slave thread
mysql-test/t/rpl000017-slave.sh:
  test oversized passwords for slave
mysql-test/t/rpl000017.test:
  test oversized passwords
sql/table.cc:
  fix to make it compile

Allow delete of crashed MyISAM tables
Fixed bug when BLOB was first part of key
Fixed bug when using result from CASE in GROUP BY
Fixed core-dump bug in monthname()
Optimized calling of check_db_name()


Docs/manual.texi:
  Added more information about myisamchk
client/mysqladmin.c:
  Added error message for CREATE database and fixed possible overflow bug
include/myisam.h:
  New myisamchk option --sort-recover
libmysql/libmysql.c:
  Removed commented code
  Don't define getpwuid (breaks on SCO 3.2)
myisam/mi_check.c:
  Fixed (new) bug when using --recover --optimize
myisam/mi_delete_table.c:
  Allow delete of crashed tables
myisam/mi_key.c:
  Fixed bug when BLOB was first part of key
myisam/myisamchk.c:
  New myisamchk option --sort-recover
mysql-test/r/case.result:
  New test cases to check for reported bugs
mysql-test/r/func_time.result:
  New test cases to check for reported bugs
mysql-test/r/type_blob.result:
  New test cases to check for reported bugs
mysql-test/r/type_datetime.result:
  New test cases to check for reported bugs
mysql-test/t/case.test:
  New test cases to check for reported bugs
mysql-test/t/func_time.test:
  New test cases to check for reported bugs
mysql-test/t/type_blob.test:
  New test cases to check for reported bugs
mysql-test/t/type_datetime.test:
  New test cases to check for reported bugs
mysys/my_bitmap.c:
  Optimize
sql-bench/limits/ms-sql.cfg:
  Updated limits
sql/item_cmpfunc.cc:
  Fixed bug when using result from CASE in GROUP BY
sql/item_cmpfunc.h:
  Fixed bug when using result from CASE in GROUP BY
sql/item_timefunc.cc:
  Fixed core-dump bug in monthname()
sql/sql_db.cc:
  Optimized calling of check_db_name()
sql/sql_parse.cc:
  Optimized calling of check_db_name()
sql/table.cc:
  Fixed typo

BUILD/FINISH.sh:
  Add --just-print and --help options, +cleanup.
BUILD/SETUP.sh:
  Add --just-print and --help options, +cleanup.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

check_db_name() referenced a non-existant variable.


sql/table.cc:
  Fixed brain-o.

into work.mysql.com:/d1/users/tim/my/work


BitKeeper/etc/logging_ok:
  auto-union

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

Docs/manual.texi:
  Changelog updated

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