Docs/manual.texi:
  Changelog

BitKeeper/etc/ignore:
  auto-union

BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h

BitKeeper/etc/ignore:
  added include/widec.h

BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown

scripts/mysqldumpslow.sh:
  Handling of strings with \ and double ''
sql/mysqlbinlog.cc:
  Fixed type

Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  new test case
mysql-test/r/innodb.result:
  Fixed result

BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0flu.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Will merge later..

Added record_rnd_buffer
Added --safe-user-create
Fix for ALTER TABLE RENAME on windows


Docs/manual.texi:
  Changelog and documentation of new features.
  More information about using threaded client libraries
include/mysql_com.h:
  Added prototype for my_thread_init()
include/mysqld_error.h:
  New error for --safe-create-user
innobase/buf/buf0flu.c:
  Portability fix
innobase/include/univ.i:
  Portability fix
mysql-test/t/distinct.test:
  Test for distinct bug
sql/mysql_priv.h:
  Added record_rnd_buffer
sql/mysqld.cc:
  Added record_rnd_buffer
sql/records.cc:
  Added record_rnd_buffer
sql/share/czech/errmsg.txt:
  New error message for --safe-user-create
sql/share/danish/errmsg.txt:
  New error message for --safe-user-create
sql/share/dutch/errmsg.txt:
  New error message for --safe-user-create
sql/share/english/errmsg.txt:
  New error message for --safe-user-create
sql/share/estonian/errmsg.txt:
  New error message for --safe-user-create
sql/share/french/errmsg.txt:
  New error message for --safe-user-create
sql/share/german/errmsg.txt:
  New error message for --safe-user-create
sql/share/greek/errmsg.txt:
  New error message for --safe-user-create
sql/share/hungarian/errmsg.txt:
  New error message for --safe-user-create
sql/share/italian/errmsg.txt:
  New error message for --safe-user-create
sql/share/japanese/errmsg.txt:
  New error message for --safe-user-create
sql/share/korean/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian-ny/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian/errmsg.txt:
  New error message for --safe-user-create
sql/share/polish/errmsg.txt:
  New error message for --safe-user-create
sql/share/portuguese/errmsg.txt:
  New error message for --safe-user-create
sql/share/romanian/errmsg.txt:
  New error message for --safe-user-create
sql/share/russian/errmsg.txt:
  New error message for --safe-user-create
sql/share/slovak/errmsg.txt:
  New error message for --safe-user-create
sql/share/spanish/errmsg.txt:
  New error message for --safe-user-create
sql/share/swedish/errmsg.txt:
  New error message for --safe-user-create
sql/sql_acl.cc:
  Checking of privileges for --safe-user-create
sql/sql_acl.h:
  --safe-user-create
sql/sql_base.cc:
  --safe-user-create
sql/sql_parse.cc:
  --safe-user-create
sql/sql_show.cc:
  --safe-user-create
sql/sql_table.cc:
  Fix for ALTER TABLE RENAME on windows

Portability fixes
Fixed problem when giving wrong arguments to myisam_recover
Fix to remove warnings when using purify


BUILD/compile-solaris-sparc-purify:
  Added innodb and berkeleydb to test
mysql-test/install_test_db.sh:
  Portability fix.
sql/ha_myisam.cc:
  Fixed problem when giving wrong arguments to myisam_recover
sql/ha_myisammrg.cc:
  Fixed bug in ALTER TABLE for MERGE tables
sql/sql_list.h:
  Fix to remove warnings when using purify
sql/sql_select.cc:
  Fix to remove warnings from purify
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  PASSWORD() issue clarified

enabled or not.


sql/mysqld.cc:
  Added notification to "show variables" whether slow-query-log is
  enabled or not.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/share/dutch/errmsg.txt:
  New dutch error messages.

and sql-mode options.


sql/mysqld.cc:
  Changed the sql-mode to be shown as a number (bits) instead
  of a string.

Docs/manual.texi:
  Fixed stupid node name.

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

(Chapter 8 Skipped, will be next.)

ibuf0ibuf.c	Fix a potential hang in database shutdown (not known if there is such, but let us play safe)


innobase/ibuf/ibuf0ibuf.c:
  Fix a potential hang in database shutdown (not known if there is such, but let us play safe)

  Paste the libtool.m4 from libtool version 1.3.4
  into aclinclude.m4; this should make our configure
  work even when the user has libtool version 1.4
  installed.  This should be removed, and everyone
  should upgrade to libtool 1.4; until then, this is
  a quick hack to make things work.


acinclude.m4:
  Paste the libtool.m4 from libtool version 1.3.4
  into aclinclude.m4; this should make our configure
  work even when the user has libtool version 1.4
  installed.  This should be removed, and everyone
  should upgrade to libtool 1.4; until then, this is
  a quick hack to make things work.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union

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


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/ha_innobase.h:
  Fix Sort aborted bug

ha_innobase.cc	Fix Sort aborted bug


sql/ha_innobase.cc:
  Fix Sort aborted bug
innobase/btr/btr0cur.c:
  Improve range size estimate for big ranges
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ltmain.sh	Don't add -lc to deplibs on FreeBSD.


ltmain.sh:
  Don't add -lc to deplibs on FreeBSD.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  New option, --sql-mode=option[,option[,option]]
sql/ha_myisam.cc:
  Fixed a segmentation fault -bug with myisam-recover which
  occurred if option specified was not a legal one.
sql/mysql_priv.h:
  New option --sql-mode
sql/mysqld.cc:
  New option --sql-mode
sql/sql_class.cc:
  New option --sql-mode
sql/sql_class.h:
  New option --sql-mode
sql/sql_lex.cc:
  option --sql-mode, ansi_quotes and ignore_space
sql/sql_parse.cc:
  option --sql-mode, ignore_space
sql/sql_select.cc:
  option --sql-mode, mode only_full_group_by
sql/sql_yacc.yy:
  option --sql-mode, modes pipes_as_concat and real_as_float
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  fixed some spacing and tag nesting problems

innobase/row/row0upd.c:
  Fix a memory overwrite which can happen if we update or delete a > 8000-byte row

buf0flu.c	Add an include to fix compile problem in non-inlined version


innobase/buf/buf0flu.c:
  Add an include to fix compile problem in non-inlined version
innobase/trx/trx0purge.c:
  Fix a bug which might stop purge from running

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


Docs/manual.texi:
  Auto merged

into x153.internalnet:/home/tonu/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged