summaryrefslogtreecommitdiff
path: root/libmysqld/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+4
|\
| * Updated/added copyright headersKent Boortz2011-06-301-3/+4
| |\
| | * Updated/added copyright headersKent Boortz2011-06-301-3/+4
* | | MWL#74: Shared libmysqld.so library.unknown2010-11-171-107/+17
* | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+0
|\ \ \ | |/ /
* | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+1
|\ \ \ | |/ /
| * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+1
* | | Added federatedx storage engineMichael Widenius2009-10-301-1/+1
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+1
|\ \ \
| * | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+1
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\ \ | | |/
| | * Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1
| | * Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+1
| | |\
* | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-0/+1
|/ / /
* | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-181-1/+1
* | | Bug#35997 Event scheduler seems to let the server crash, if it is embedded.unknown2008-05-091-3/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-061-1/+2
|\ \ \
| * | | Use pkglibdir to simplify pkgplugindir, and fix the path in aunknown2008-01-021-1/+1
| * | | Add new pkgplugindir handling to seperate plugins from libraries,unknown2007-12-191-1/+2
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-2/+4
|\ \ \ \ | |/ / /
| * | | Makefile.am:unknown2007-09-261-1/+2
| * | | Makefile.am:unknown2007-08-021-1/+1
| * | | Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndbunknown2007-05-071-0/+1
| |\ \ \ | | |/ /
| | * | Fix SCI Transporterunknown2007-05-071-1/+1
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02unknown2007-05-071-4/+7
|\ \ \ \ | |/ / /
| * | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-05-021-3/+3
| |\ \ \ | | |/ /
| | * | Format corrections for various "Makefile.am": Leading tab, no trailing blank.unknown2007-05-021-3/+3
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2007-04-241-1/+4
| |\ \ \
| | * | | ha_ndbcluster.h, ha_ndbcluster.cc:unknown2007-04-241-1/+4
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...unknown2007-04-271-0/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communityunknown2007-01-031-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Bug#24795: Add SHOW PROFILEunknown2007-01-031-0/+1
* | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-04-231-7/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508unknown2007-04-111-7/+8
| |\ \ \
| | * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditunknown2007-03-271-7/+8
* | | | | WL#2735: Refactor replicationunknown2007-04-131-1/+1
* | | | | BUG#27779 (Slave cannot read old rows log events):unknown2007-04-121-1/+3
|/ / / /
* | | | Fixed compiler warningsunknown2007-02-231-1/+2
|/ / /
* | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-01-121-1/+1
|\ \ \
| * | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)unknown2007-01-111-1/+1
* | | | Merge mysql.com:/d2/hf/clean/my51-cleanunknown2006-12-311-4/+24
|\ \ \ \
| * | | | WL#3630 (add embedded server to pushbuild)unknown2006-12-281-4/+24
| |/ / /
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-311-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | my_strtoll10-x86.s:unknown2006-12-311-1/+1
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+2
|\ \ \ \ | |/ / /
| * | | Many files:unknown2006-12-231-2/+2
| | |/ | |/|
* | | WL# 3031unknown2006-12-011-1/+2
| |/ |/|
* | Many files:unknown2006-11-291-2/+2
* | Merge mysql.com:/home/kent/bk/mysql-5.0unknown2006-11-271-5/+17
|\ \ | |/