summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* merge fix for Bug40280 from 5.0Vladislav Vaintroub2008-10-231-2/+4
|\
| * Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.Vladislav Vaintroub2008-10-231-1/+2
* | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-181-2/+2
* | Bug#35997 Event scheduler seems to let the server crash, if it is embedded.thek@adventure.(none)2008-05-091-2/+3
* | mysqld.cc:kent/mysqldev@mysql.com/production.mysql.com2008-04-021-1/+7
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildjperkin/jonathan@chorlton.adsl.perkin.org.uk2008-03-061-1/+2
|\ \
| * | Use pkglibdir to simplify pkgplugindir, and fix the path in ajperkin/jonathan@chorlton.adsl.perkin.org.uk2008-01-021-1/+1
| * | Add new pkgplugindir handling to seperate plugins from libraries,jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-191-1/+2
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintserg@janus.mylan2007-12-201-0/+1
|\ \ \ | |/ /
| * | Makefile.am:serg@janus.mylan2007-10-081-0/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationcmiller@zippy.cornsilk.net2007-10-171-23/+22
|\ \ \ | |/ /
| * | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-09-261-2/+5
| * | Merge maint1.mysql.com:/data/localhome/tsmith/bk/51tsmith@maint1.mysql.com2007-07-041-2/+1
| |\ \
| | * \ Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-06-281-2/+1
| | |\ \ | | | |/
| | | * Bug#29414 HPUX build fails - 'noinst_HEADERS' does not existmsvensson@pilot.(none)2007-06-281-2/+1
| * | | Bug#29451 (Broken makefile dependencies with libndb.la)malff/marcsql@weblab.(none)2007-06-291-1/+1
| * | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-251-18/+12
| |\ \ \ | | |/ / | |/| |
| | * | Fix broken automatic dependency tracking of Automake in sql/:kostja@bodhi.(none)2007-06-221-18/+12
| * | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-111-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-091-0/+2
| | |\ \
| | | * | BUG#24954 (Last_errno and Last_error not set after master_retry_count was rea...mats@kindahl-laptop.dnsalias.net2007-06-091-0/+2
| * | | | Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-buildkent@kent-amd64.(none)2007-05-301-1/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-buildkent@kent-amd64.(none)2007-05-301-1/+2
| | |\ \
| | | * | Makefile.am, configure.in:kent@mysql.com/kent-amd64.(none)2007-05-301-1/+2
| | * | | Moved all code related to engine_condition_pushdown to a new class,mskold/marty@mysql.com/linux.site2007-04-231-2/+3
| * | | | Manual mergemikron@mikael-ronstr-ms-dator.local2007-05-071-1/+1
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02cmiller@zippy.cornsilk.net2007-05-071-6/+9
|\ \ \ \ \ | |/ / / /
| * | | | Added missing backslashmskold/marty@mysql.com/linux.site2007-04-241-1/+1
| * | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbmskold/marty@linux.site2007-04-241-6/+9
| |\ \ \ \
| | * | | | ha_ndbcluster.h, ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-04-241-6/+9
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...cmiller@zippy.cornsilk.net2007-04-271-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-04-031-0/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...cmiller@zippy.cornsilk.net2007-02-271-0/+2
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+2
| | | |\ \ \ \
| | | | * | | | Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+2
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777msvensson@neptunus.(none)2007-02-151-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-231-18/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-111-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-271-2/+2
| * | | | | | | | Bug#25337 Cannot build with OpenSSL supportmsvensson@pilot.blaudden2007-04-041-14/+7
| * | | | | | | | Bug#25337 Cannot build with OpenSSL supportmsvensson@pilot.blaudden2007-04-031-2/+1
* | | | | | | | | WL#2735: Refactor replicationmats@romeo.(none)2007-04-131-3/+4
* | | | | | | | | BUG#27779 (Slave cannot read old rows log events):mats@romeo.(none)2007-04-121-0/+2
|/ / / / / / / /
* | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-03-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | WL#3464: Add replication event to denote gap in replicationmats@romeo.(none)2007-03-291-1/+1
* | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-03-011-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-4/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Clean "gen_lex_hash" if it's been builtmsvensson@pilot.blaudden2007-02-191-0/+1
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777msvensson@neptunus.(none)2007-02-151-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove the hack to let lex_hash.h depend on it's tool and not the sourcesmsvensson@neptunus.(none)2007-02-151-5/+6