Skip to content

GitLab

Switch branch/tag
History Find file
Clone
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
unknown authored 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2


mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Manual 
  Manual merge, partial
d70fde4c
Name Last commit Last update
BUILD More fully disable ccache when not compatible with gcov.
BitKeeper Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
Docs Merge mysql.com:/home/kent/bk/mysql-5.0-build
client Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
cmd-line-utils Merge mysql.com:/home/my/mysql-5.0
config/ac-macros Many files:
dbug Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
extra Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
include Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
libmysql Merge bk-internal.mysql.com:/home/bk/mysql-5.1
libmysql_r Merge mysql.com:/home/kent/bk/mysql-4.1
libmysqld Merge bk-internal.mysql.com:/home/bk/mysql-5.1
man Makefile.am, configure.in:
mysql-test Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
mysys Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
netware Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
plugin Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
pstack Makefile.am, configure.in:
regex Merge mysql.com:/home/my/mysql-5.0
scripts Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
server-tools Post-merge fixes.
sql-bench Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
sql-common Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
sql Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
storage Merge bk-internal.mysql.com:/home/bk/mysql-5.1
strings
support-files
tests
unittest
vio
win
zlib
.bzrignore
.cvsignore
CMakeLists.txt
COPYING
Makefile.am
README
configure.in
README
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.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7