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 8370bb3433 Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict
into  four.local.lan:/WORK2/merge/mysql-5.1-build-datadict

It is to be expected that a post merge fix is needed.


mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/t/innodb__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam__datadict.test:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Manual merge
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Manual merge
2007-08-28 19:41:14 +02:00
BitKeeper
BUILD Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
client Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
cmd-line-utils
config/ac-macros
dbug
debian
Docs
extra Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-08-14 00:22:34 +03:00
include Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
libmysql Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 2007-08-24 15:25:02 +03:00
libmysql_r
libmysqld Merge bk-internal:/home/bk/mysql-5.1-marvel 2007-08-16 21:56:47 +02:00
man
mysql-test Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict 2007-08-28 19:41:14 +02:00
mysys Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 2007-08-25 12:08:18 +03:00
netware Merge trift2.:/MySQL/M50/netware2-5.0 2007-08-24 23:40:36 +02:00
plugin
pstack
regex Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-08-16 18:21:47 +02:00
scripts Merge trift2.:/MySQL/M51/netware3-5.1 2007-08-27 14:02:45 +02:00
server-tools Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-08-16 18:21:47 +02:00
sql Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 2007-08-27 12:03:17 +02:00
sql-bench
sql-common Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
storage Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge 2007-08-27 10:38:01 +02:00
strings Merge trift2.:/MySQL/M51/target-5.1.22 2007-08-22 16:08:55 +02:00
support-files
tests Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 2007-08-24 15:25:02 +03:00
unittest
vio Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 2007-08-16 18:21:47 +02:00
win
zlib
.bzrignore
.cvsignore
CMakeLists.txt
configure.in Merge trift2.:/MySQL/M51/netware3-5.1 2007-08-27 14:02:45 +02:00
COPYING
EXCEPTIONS-CLIENT
Makefile.am
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.