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 7463704e1c Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1


client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge
client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge
2006-11-21 23:12:45 +02:00
BitKeeper Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 2006-11-13 17:59:51 +01:00
BUILD Fix a typo in SETUP.sh 2006-11-06 11:30:54 +03:00
client Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02: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 mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-11-13 12:45:31 +01:00
libmysql Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +02: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 bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02:00
mysys Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02: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 bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02:00
server-tools Fix Bug #22494 Instance Manager: Inconsistent error message wording 2006-11-07 05:21:33 +03:00
sql Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02:00
sql-common Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 2006-11-10 15:05:38 +03:00
storage Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-21 23:12:45 +02:00
strings Merge mysql.com:/usr/home/bar/mysql-5.0-rpl 2006-11-03 10:29:44 +04:00
support-files support-files/mysql.spec.sh : Make the server report its features in the first test run. 2006-11-13 12:10:12 +01:00
tests Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 2006-11-07 16:24:35 +03:00
unittest Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 2006-11-07 19:26:31 +01:00
vio Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint 2006-11-08 06:16:12 +03: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 neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-10-24 22:02:33 +02:00
.cvsignore
CMakeLists.txt In current 5.1 build we don't build embedded server for windows (this will be 2006-09-18 17:28:17 +02:00
configure.in Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 2006-11-15 13:17:43 +01:00
COPYING
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.