Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
unknown authored
into  mysql.com:/home/alexi/innodb/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Hand-merge
mysql-test/t/innodb.test:
  Hand_merge
b03267a0
Name Last commit Last update
BUILD Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
BitKeeper post-commit:
Docs Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
VC++Files libmysqld.vcproj, mysqld.vcproj:
client Merge
cmd-line-utils Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
config/ac-macros fixes for 'make dist' and 'make distcheck'
dbug Final patch to remove the last of the OS2 support.
extra Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.
include Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
libmysql Final patch to remove the last of the OS2 support.
libmysql_r fixes for 'make dist' and 'make distcheck'
libmysqld Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
man - Removed obsolete and outdated man page files from the man
mysql-test Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
mysys Fix wrong auto merge
netware Merge
plugin fixes for 'make dist' and 'make distcheck'
pstack Makefile.am, configure.in:
regex Some changes to make it possible to build for Windows with CMake from
scripts Delete unused (and unmaintained) scripts.
server-tools Bug #19059: Failure to get version information when running from source tree
sql-common Final patch to remove the last of the OS2 support.
sql Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
storage Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
strings
support-files
tests
unittest
vio
win
zlib
.bzrignore
.cvsignore
COPYING
Makefile.am
README
cmakelists.txt
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.