MariaDB server is a community developed fork of MySQL server. Started by core members of the original MySQL team, MariaDB actively works with outside developers to deliver the most featureful, stable, and sanely licensed open SQL server in the industry.
Find a file
unknown baddc8bdca Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged
2007-02-01 19:41:04 +01:00
BitKeeper Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
BUILD Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
client Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
cmd-line-utils Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
config/ac-macros Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
dbug Many files: 2006-12-31 02:29:11 +01:00
Docs Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
extra Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 09:43:44 -05:00
include Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
libmysql Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 2007-01-18 08:41:52 -07:00
libmysql_r my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
libmysqld Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
man my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql-test Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
mysys Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
netware Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
plugin Made the example actually do something :) 2007-01-25 18:43:40 -08:00
pstack my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
regex Many files: 2006-12-31 02:29:11 +01:00
scripts Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
server-tools Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
sql Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-22 19:18:22 +02:00
sql-common Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
storage Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-01 15:15:40 +01:00
strings Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 09:43:44 -05:00
support-files Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
tests Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 2007-01-19 11:12:24 +01:00
unittest Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
vio Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 09:43:44 -05:00
win Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage 2007-01-11 09:19:32 +01:00
zlib Many files: 2006-12-31 02:29:11 +01:00
.bzrignore bug #22682 Test fails --without-geometry 2007-01-24 14:49:36 +04:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
CMakeLists.txt Many files: 2006-12-31 02:29:11 +01:00
configure.in Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2007-02-01 19:41:04 +01:00
configure.in.rej Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 2007-01-22 03:33:59 +02:00
COPYING - manual.texi will be replaced with a manual written in DocBook/XML. This ChangeSet removes all 2005-04-13 11:51:38 +02:00
Makefile.am Bug#25844: "make test" does not find mysql-test-run.pl 2007-02-01 15:59:51 +01:00
README make_binary_distribution.sh: 2006-11-07 22:26:37 +01:00

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.