Merge debian.(none):/MySQL/M50/indent-5.0
unknown authored
into  debian.(none):/MySQL/M51/indent-5.1

Manual merge of a formatting change.


Makefile.am:
  Manual merge of the formatting change in 5.0,
  the test actions differ so much that automerge doesn't work.
c61bac89
Name Last commit Last update
BUILD autorun.sh:
BitKeeper Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
Docs ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
client Bug#25146 Some warnings/errors not shown when using --show-warnings
cmd-line-utils Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
config/ac-macros Bug#30296
dbug Bug #27099: system_mysql fail in pushbuild windows
extra Merge ramayana.hindu.god:/home/tsmith/m/bk/51
include Merge trift2.:/MySQL/M51/mysql-5.1
libmysql Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0
libmysql_r Makefile.am:
libmysqld Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0
man my_strtoll10-x86.s:
mysql-test Merge trift2.:/MySQL/M51/mysql-5.1
mysys Merge stella.local:/home2/mydev/mysql-5.1-bug26379-8
netware Minor Makefile fixes:
plugin Makefile.am:
pstack Makefile.am, configure.in:
regex Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
scripts fix make distcheck in a different way
server-tools WL#4104: Deprecate the Instance Manager.
sql-bench Fixed compiler warnings
sql-common Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
sql Merge trift2.:/MySQL/M51/mysql-5.1
storage Merge stella.local:/home2/mydev/mysql-5.0-axmrg
strings
support-files
tests
unittest
vio
win
zlib
.bzrignore
.cvsignore
CMakeLists.txt
COPYING
EXCEPTIONS-CLIENT
INSTALL-SOURCE
INSTALL-WIN-SOURCE
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.