Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
unknown authored
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Auto merged
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Auto merged
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Auto merged
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Auto merged
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Auto merged
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Auto merged
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Auto merged
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Auto merged
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Auto merged
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Auto merged
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Auto merged
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
  Auto merged
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
  Auto merged
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
  Auto merged
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
  Auto merged
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
  Auto merged
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
  Auto merged
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
  Auto merged
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
  Auto merged
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
  Auto merged
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
  Auto merged
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
  Auto merged
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
  Auto merged
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
  Auto merged
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
  Auto merged
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
  Auto merged
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
  Auto merged
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
  Auto merged
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
  Auto merged
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
  Auto merged
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
  Auto merged
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
  Auto merged
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
  Auto merged
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
  Auto merged
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
  Auto merged
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
  Auto merged
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
  Auto merged
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
  Auto merged
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
  Auto merged
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
  Auto merged
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
  Auto merged
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
  Auto merged
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
  Auto merged
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
  Auto merged
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
  Auto merged
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
  Auto merged
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
  Auto merged
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
  Auto merged
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
  Auto merged
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
  Auto merged
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
  Auto merged
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
  Auto merged
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
  Auto merged
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
  Auto merged
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
  Auto merged
4ae4bb37
Name Last commit Last update
BUILD Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
BitKeeper Merge bk-internal.mysql.com:/home/bk/mysql-5.1
Docs Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
client Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
cmd-line-utils Fixed compiler warnings
config/ac-macros files are in storage/ndb in 5.1. fix merge from 5.0
dbug dbug/dbug.c: unused variable removed
extra Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
include build fix for netware
libmysql Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50
libmysql_r my_strtoll10-x86.s:
libmysqld Fixed compilations problems and warnings on windows
man my_strtoll10-x86.s:
mysql-test mysqlbinlog-cp932.test:
mysys CMakeLists.txt:
netware Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
plugin Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
pstack my_strtoll10-x86.s:
regex Many files:
scripts Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
server-tools Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
sql-bench Fixed compiler warnings
sql-common Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
sql Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
storage Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
strings
support-files
tests
unittest
vio
win
zlib
.bzrignore
.cvsignore
CMakeLists.txt
COPYING
EXCEPTIONS-CLIENT
Makefile.am
README
configure.in
This is a release of MySQL, a dual-license SQL database server.
MySQL is brought to you by the MySQL team at MySQL AB.

License information can be found in these files:
- For GPL (free) distributions, see the COPYING file and
  the EXCEPTIONS-CLIENT file.
- For commercial distributions, see the LICENSE.mysql file.


For further information about MySQL or additional documentation, see:
- The latest information about MySQL: http://www.mysql.com
- The current MySQL documentation: http://dev.mysql.com/doc

Some manual sections of special interest:

- If you are migrating from an older version of MySQL, please read the
  "Upgrading from..." section first!
- To see what MySQL can do, take a look at the features section.
- For installation instructions, see the Installing and Upgrading chapter.
- For the new features/bugfix history, see the Change History appendix.
- For the currently known bugs/misfeatures (known errors) see the Problems
  and Common Errors appendix.
- For a list of developers and other contributors, see the Credits
  appendix.

A local copy of the MySQL Reference Manual can be found in the Docs
directory in GNU Info format.  You can also browse the manual online or
download it in any of several formats at the URL given earlier in this
file.

************************************************************

IMPORTANT:

Bug or error reports should be sent to http://bugs.mysql.com.