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 51bb36a0e2 Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into  gbichot3.local:/home/mysql_src/mysql-maria


BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Makefile.am:
  Auto merged
config/ac-macros/plugins.m4:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/my_pread.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
unittest/mytap/tap.c:
  Auto merged
include/myisam.h:
  merge
sql/mysqld.cc:
  merge
storage/myisam/mi_check.c:
  merge
storage/myisam/myisamdef.h:
  merge
2006-12-18 21:04:35 +01:00
BitKeeper Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
BUILD Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
client Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-03 17:53:10 +01:00
cmd-line-utils Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557 2006-02-21 08:57:18 +01:00
config/ac-macros Merge trift2.:/MySQL/M51/clone-5.1 2006-11-01 13:26:03 +01:00
dbug Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
Docs Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 2006-11-07 23:01:38 +01:00
extra Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-10-24 12:53:47 +02:00
include Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
libmysql Maria - various fixes around durability of files: 2006-11-21 22:22:59 +01:00
libmysql_r Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00
libmysqld Bug #23427: incompatible ABI change in 5.0.26? 2006-10-24 19:05:11 +02:00
man Makefile.am, configure.in: 2006-07-28 23:12:40 +02:00
mysql-test Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
mysys Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
netware Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-02 17:51:59 -05:00
plugin Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
pstack Makefile.am, configure.in: 2005-09-24 15:51:45 +02:00
regex make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
scripts Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 2006-11-07 23:01:38 +01:00
server-tools Fix Bug #22494 Instance Manager: Inconsistent error message wording 2006-11-07 05:21:33 +03:00
sql Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
sql-common Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 2006-11-07 16:24:35 +03:00
storage Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
strings Merge mysql.com:/home/hf/mysql-5.0.mrg 2006-10-12 15:42:05 +05:00
support-files mysql.spec.sh: 2006-10-18 12:35:45 +02:00
tests Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 2006-11-07 16:24:35 +03:00
unittest Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
vio Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-07 16:17:54 +01:00
win Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge). 2006-09-21 08:57:47 +02:00
zlib Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 2006-09-18 10:43:06 +05:00
.bzrignore Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
CMakeLists.txt Bug#22224: Windows build depends on ib_config.h 2006-09-28 15:18:33 -04:00
configure.in Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean 2006-12-18 21:04:35 +01: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 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 2006-10-14 17:31:04 +02: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.