Docs/manual.texi:
  misc. small fixes

manual.texi	Make a few -ized -> -ised changes.


Docs/manual.texi:
  Fix a few glitches in my last commit.
  Make a few -ized -> -ised changes.

manual.texi	- Clean up DES function descriptions.
manual.texi	- Correct incorrect INET_NTOA() description.
manual.texi	- Break too-long lines in a few query examples.


Docs/manual.texi:
  - Clean up some privilege name references.
  - Clean up DES function descriptions.
  - Correct incorrect INET_NTOA() description.
  - Break too-long lines in a few query examples.

manual.texi	Fix a too-long-line in query example.


Docs/manual.texi:
  Change note mods, 4.0.2.
  Fix a too-long-line in query example.

Docs/manual.texi:
  fixing my texi errors

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  I have to document my bug fixes ...
readline/Makefile.am:
  Fix for core dump in mysql monitor program when some Ctrl keys are
  pressed
sql/convert.cc:
  Fix of the bug with columns > 64 K when SET CHAR.. SET is used

Docs/manual.texi:
  capitalize des_encrypt()/des_descrypt()

manual.texi	OSF1 -> OSF/1
manual.texi	Let's get those trademarks right. :-)


Docs/manual.texi:
  sparc, Sparc, etc. -> SPARC
  OSF1 -> OSF/1
  Let's get those trademarks right. :-)

Docs/manual.texi:
  minor fixups

manual.texi	fix typo


Docs/manual.texi:
  Change note mods, 3.23.39 to 4.0.2.

  Update


Docs/mirrors.texi:
  Update

Fixed use of unitialized key

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ChangeLog:
  Delete: zlib/ChangeLog
BitKeeper/deleted/.del-descrip.mms:
  Delete: zlib/descrip.mms
BitKeeper/deleted/.del-zlib.def:
  Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-example.c:
  Delete: zlib/example.c
BitKeeper/deleted/.del-faq:
  Delete: zlib/faq
BitKeeper/deleted/.del-gzio.c:
  Delete: zlib/gzio.c
BitKeeper/deleted/.del-index:
  Delete: zlib/index
BitKeeper/deleted/.del-infblock.c:
  Delete: zlib/infblock.c
BitKeeper/deleted/.del-infblock.h:
  Delete: zlib/infblock.h
BitKeeper/deleted/.del-infcodes.c:
  Delete: zlib/infcodes.c
BitKeeper/deleted/.del-infcodes.h:
  Delete: zlib/infcodes.h
BitKeeper/deleted/.del-inffast.c:
  Delete: zlib/inffast.c
BitKeeper/deleted/.del-Make_vms.com:
  Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-inffast.h:
  Delete: zlib/inffast.h
BitKeeper/deleted/.del-inffixed.h:
  Delete: zlib/inffixed.h
BitKeeper/deleted/.del-inflate.c:
  Delete: zlib/inflate.c
BitKeeper/deleted/.del-inftrees.c:
  Delete: zlib/inftrees.c
BitKeeper/deleted/.del-inftrees.h:
  Delete: zlib/inftrees.h
BitKeeper/deleted/.del-infutil.c:
  Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h:
  Delete: zlib/infutil.h
BitKeeper/deleted/.del-maketree.c:
  Delete: zlib/maketree.c
BitKeeper/deleted/.del-minigzip.c:
  Delete: zlib/minigzip.c
BitKeeper/deleted/.del-readme:
  Delete: zlib/readme
BitKeeper/deleted/.del-Makefile.riscos:
  Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-trees.c:
  Delete: zlib/trees.c
BitKeeper/deleted/.del-trees.h:
  Delete: zlib/trees.h
BitKeeper/deleted/.del-uncompr.c:
  Delete: zlib/uncompr.c
BitKeeper/deleted/.del-zconf.h:
  Delete: zlib/zconf.h
BitKeeper/deleted/.del-zlib.3:
  Delete: zlib/zlib.3
BitKeeper/deleted/.del-zlib.dsp:
  Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.h:
  Delete: zlib/zlib.h
BitKeeper/deleted/.del-zlib.html:
  Delete: zlib/zlib.html
BitKeeper/deleted/.del-zutil.c:
  Delete: zlib/zutil.c
BitKeeper/deleted/.del-zutil.h:
  Delete: zlib/zutil.h
BitKeeper/deleted/.del-adler32.c:
  Delete: zlib/adler32.c
BitKeeper/deleted/.del-Makefile.pup:
  Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas:
  Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib:
  Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-visual-basic.txt:
  Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32.asm:
  Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-gvmat32c.c:
  Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat:
  Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def:
  Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp:
  Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw:
  Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-algorithm.txt:
  Delete: zlib/algorithm.txt
BitKeeper/deleted/.del-match.s:
  Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586:
  Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-match.s~1:
  Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686:
  Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak:
  Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-zlibdef.pas:
  Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-d_zlib.bpr:
  Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp:
  Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-readme.txt:
  Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg:
  Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-compress.c:
  Delete: zlib/compress.c
BitKeeper/deleted/.del-zlib.bpr:
  Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp:
  Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas:
  Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr:
  Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-zlib32.cpp:
  Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-test.cpp:
  Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp:
  Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zfstream.h:
  Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h:
  Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp:
  Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-crc32.c:
  Delete: zlib/crc32.c
BitKeeper/deleted/.del-ChangeLogUnzip:
  Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-miniunz.c:
  Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c:
  Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~1:
  Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c:
  Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def:
  Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h:
  Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c:
  Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def:
  Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h:
  Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-deflate.c:
  Delete: zlib/deflate.c
BitKeeper/deleted/.del-zlibvc.def~1:
  Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~1:
  Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~1:
  Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32:
  Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c:
  Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.b32:
  Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor:
  Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2:
  Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx:
  Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc:
  Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-deflate.h:
  Delete: zlib/deflate.h
BitKeeper/deleted/.del-Makefile.tc:
  Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32:
  Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat:
  Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~1:
  Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc:
  Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~1:
  Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc:
  Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt:
  Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt:
  Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-Makefile.os2:
  Delete: zlib/os2/Makefile.os2
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge

Docs/manual.texi:
  fix a few typos.

BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/mysqldumpslow.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
Docs/manual.texi:
  merge
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
innobase/buf/buf0buf.c:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/range.result:
  merge
sql/ha_innodb.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_load.cc:
  merge

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updated STRCMP and UNION information
configure.in:
  Portability fix
include/config-win.h:
  Fix for WIN64
include/mysql_com.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
mysys/array.c:
  Cleanup
mysys/thr_alarm.c:
  Cleanup
sql/ha_innodb.cc:
  Cleanup

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

  Cleanup


Docs/manual.texi:
  Cleanup

  Cleanup


Docs/manual.texi:
  Cleanup

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
include/mysql_com.h:
  cleanup
sql/mysqld.cc:
  Fixed overflow bug in startup parameters to MySQL

scripts/mysqldumpslow.sh:
  Fix for new slow log format

Docs/manual.texi:
  fix typo

manual.texi	DEC is also a synonym for DECIMAL.


Docs/manual.texi:
  NUMERIC(M,D) arguments are optional.
  DEC is also a synonym for DECIMAL.

manual.texi	and "e-mail" other times.


Docs/manual.texi:
  Use "e-mail" consistently, not "email" sometimes
  and "e-mail" other times.

Optimize for pentiumpro for RPM's.


Build-tools/Do-rpm:
  Use compiler option -mpentiumpro
configure.in:
  Print compiler version

Docs/manual.texi:
  fix oops in mysql_data_seek() prototype.