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.
  • MariaDB\ 71.8%
  • C++ 16.4%
  • C 10.4%
  • Shell 0.5%
  • Perl 0.4%
  • Other 0.3%
Find a file
unknown fba86d2b7e Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51


BUILD/SETUP.sh:
  Auto merged
client/Makefile.am:
  Auto merged
dbug/Makefile.am:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysys/my_seek.c:
  Auto merged
regex/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-mytest.c:
  Delete: libmysql/mytest.c
BitKeeper/deleted/.del-make_win_bin_dist:
  Delete: scripts/make_win_bin_dist
BitKeeper/deleted/.del-message.mc~1:
  Delete: sql/message.mc
Makefile.am:
  Manual merge (use local)
configure.in:
  Manual merge (use local)
BitKeeper/deleted/.del-Makefile.in:
  Manual merge (use local)
client/mysqlbinlog.cc:
  Manual merge (use local)
extra/Makefile.am:
  Manual merge (use local)
extra/comp_err.c:
  Manual merge (use local)
extra/yassl/Makefile.am:
  Manual merge (use local)
extra/yassl/taocrypt/Makefile.am:
  Manual merge (use local)
include/my_dbug.h:
  Manual merge (use local)
mysql-test/mysql-test-run.pl:
  Manual merge (use local)
mysql-test/lib/mtr_process.pl:
  Manual merge (use local)
mysys/Makefile.am:
  Manual merge (use local)
server-tools/Makefile.am:
  Manual merge (use local)
sql/Makefile.am:
  Manual merge (use local)
sql/sp.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_class.h:
  Manual merge (use local)
sql/sql_select.cc:
  SCCS merged
sql/table.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/heap/Makefile.am:
  Manual merge (use local)
storage/myisam/Makefile.am:
  Manual merge (use local)
storage/myisammrg/Makefile.am:
  Manual merge (use local)
strings/Makefile.am:
  Manual merge (use local)
vio/Makefile.am:
  Manual merge (use local)
zlib/Makefile.am:
  Manual merge (use local)
2006-09-13 09:03:52 +02:00
bdb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
BitKeeper Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
BUILD Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
client Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +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 Many files: 2006-08-21 15:34:29 +02:00
dbug Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
Docs Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 2006-04-11 18:54:24 -07:00
extra Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 13:53:06 -04:00
heap Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
include Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
innobase Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
libmysql Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
libmysql_r Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00
libmysqld Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-09-12 14:49:41 +02:00
man Makefile.am, configure.in: 2006-07-28 23:12:40 +02:00
myisam Bug#20789 Merge Subtable Rename Causes Crash 2006-09-12 14:23:41 +02:00
myisammrg Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
mysql-test Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
mysys Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053 2006-08-30 21:53:33 -04:00
netware Fixed warning message breakage. 2006-08-13 22:28:41 -07:00
plugin minor plugin api fixes: 2006-09-07 12:56:32 +02:00
pstack Makefile.am, configure.in: 2005-09-24 15:51:45 +02:00
regex Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-23 17:27:54 -04:00
scripts Merge zim.(none):/home/brian/mysql/dep-5.1 2006-08-14 21:26:33 -07:00
server-tools Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
sql Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
sql-common Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
storage Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
strings Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-08-17 16:37:16 +02:00
support-files Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 2006-08-24 19:11:51 +02:00
tests Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals 2006-08-31 11:34:17 -04:00
unittest Fixing unit test execution script to work with AIX 5.2 and OS X machines. 2006-08-14 13:52:05 +02:00
vio Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 16:46:55 -04:00
win Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
zlib Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
.bzrignore Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 2006-09-01 10:32:20 +02:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
CMakeLists.txt Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-25 14:07:30 -07:00
configure.in configure.in : NDB version and general version must be (kept) in sync - do that. 2006-09-07 17:51:28 +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 Many files: 2006-08-21 15:34:29 +02:00
README README: 2006-04-01 04:13:33 +02: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.
- For commercial distributions, see the MySQLEULA.txt 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 Installation chapter.
- For future plans, see the TODO appendix.
- For the new features/bugfix history, see the News appendix.
- For the currently known bugs/misfeatures (known errors) see the problems
  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.