BitKeeper/etc/logging_ok:
  Auto merged

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

sql_show.cc	Fix to add space in SHOW CREATE TABLE between index name and column definitions


sql/sql_show.cc:
  Fix to add space in SHOW CREATE TABLE between index name and column definitions
client/mysqldump.c:
  Fix to add space between index name and column definition in CREATE TABLE statement

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

mysys/my_bitmap.c:
  Clear bitmap array

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

Docs/manual.texi:
  Changelog

reading while the table was being backed up.


sql/sql_table.cc:
  open_for_modify should be FALSE in mysql_backup_table

Changed BITMAP to MY_BITMAP to avoid type conflict on windows


configure.in:
  Force sockets to be blocking on HPUX 11.0
include/my_bitmap.h:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_bitmap.c:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_init.c:
  Removed LOCK_bitmap
sql/mysql_priv.h:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/mysqld.cc:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/violite.c:
  Force sockets to be blocking on HPUX 11.0

Patches for Armstrong
Removed warnings when using REPAIR TABLE .. EXTENDED


Docs/manual.texi:
  Changelog
configure.in:
  Added missing -lsocket library on SCO
include/global.h:
  Patch for Armstrong
include/my_bitmap.h:
  Changed bitmap interface to avoid problem with missing LOCK_bitmap symbol
include/myisampack.h:
  Portability fix for Armstrong
mysql-test/t/select.test:
  Changed to work with 'mysql test < select.tst'
mysys/my_bitmap.c:
  Changed bitmap interface to avoid problem with missing LOCK_bitmap symbol
mysys/my_init.c:
  Removed LOCK_bitmap
sql/field.cc:
  Patch for Armstrong
sql/filesort.cc:
  Patch for Armstrong
sql/ha_myisam.cc:
  Removed warnings when using REPAIR TABLE .. EXTENDED
sql/mysql_priv.h:
  Use new bitmap interface
sql/mysqld.cc:
  Use new bitmap interface
sql/sql_select.cc:
  Use new bitmap interface

Docs/manual.texi:
  Updated MyODBC installation
sql/share/Makefile.am:
  Fixed typo

README:
  Cleanup
sql-bench/Makefile.am:
  Remove deleted directory
sql/mysqlbinlog.cc:
  Cleanup --help

Docs/manual.texi:
  Added link
sql/share/Makefile.am:
  Fixed typo

sql/item_func.cc:
  auto-init of ft-index restored (to cope with const/system tables)

Docs/manual.texi:
  Lots of cleanups.

Thanks to Chris Richmond MD6-FDC <crichmon@pcocd2.intel.com> for the
patch.


sql-bench/crash-me.sh:
  fix bug with $limits{create_index} handling.
  fix typo (result_type -> $result_type).
sql-bench/server-cfg.sh:
  fix uninitialized variable warning.

Build-tools/mysql-copyright:
  remove use of cp -a.
sql-bench/Makefile.am:
  fix broken dist-hook target (brain-o)
sql/share/Makefile.am:
  remove use of cp -a.

Docs/manual.texi:
  change notes update

Docs/manual.texi:
  s/Korea/South Korea/.

Docs/manual.texi:
  Added mirror in South Korea (again).

Docs/manual.texi:
  merged

Docs/manual.texi:
  Added TODO section to Full-text entry

Docs/manual.texi:
  Auto merged

Fixed bug in GROUP BY on ELT()
Added SEQUENCE() to UDF examples


BUILD/FINISH.sh:
  Avoid error message if tmp exists
Docs/manual.texi:
  Cleaned up bug reporting section
mysys/my_init.c:
  Workaround for bug in thread library in Unixware 7
readline/input.c:
  Portability fix
scripts/mysql_install_db.sh:
  Made host, user and db field binary
sql/item_func.h:
  Fixed bug in GROUP BY on ELT()
sql/item_strfunc.cc:
  Fixed bug in GROUP BY on ELT()
sql/share/Makefile.am:
  Don't automaticly checkout SCCS files
sql/sql_select.cc:
  Cleanups
sql/udf_example.cc:
  Added SEQUENCE() to UDF examples.

    skip gcc2_compiled. junk


extra/resolve_stack_dump.c:
  skip gcc2_compiled. junk

Docs/manual.texi:
  merged

Docs/manual.texi:
  typo fixed

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.