Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
unknown authored
into  mysql.com:/home/mydev/mysql-5.1-amerge


mysys/thr_lock.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/lock_multi.result:
  Manual merge
mysql-test/t/lock_multi.test:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
83d20ff7
Name Last commit Last update
BUILD Merge bk-internal.mysql.com:/home/bk/mysql-5.1
BitKeeper Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.
Docs Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
client Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
cmd-line-utils Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
config/ac-macros Merge xiphis.org:/home/antony/work2/p4-bug12096.2
dbug atomic ops:
extra Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
include Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
libmysql Re-apply missing changeset, orignally pushed by elliot
libmysql_r Re-apply missing changeset, orignally pushed by elliot
libmysqld manual merge
man - Removed obsolete and outdated man page files from the man
mysql-test Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
mysys Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
netware Merge
plugin Remove compiler warnings
pstack Makefile.am, configure.in:
regex Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
scripts Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist
server-tools Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
sql-common Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
sql Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
storage ndb - bug#20751 : report also composite op in merge
strings Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
support-files
tests
unittest
vio
win
zlib
.bzrignore
.cvsignore
CMakeLists.txt
COPYING
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.
- For commercial distributions, see the MySQLEULA.txt 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 Installation chapter.
- For future plans, see the TODO appendix.
- For the new features/bugfix history, see the News appendix.
- For the currently known bugs/misfeatures (known errors) see the problems
  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.