summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Merge trift-lap.fambruehe:/MySQL/M50/push-5.0joerg@trift-lap.fambruehe2007-04-261-0/+4
|\
| * Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0joerg@trift-lap.fambruehe2007-04-261-0/+4
| |\
| | * Added funcs_1 and funcs_2 to the test-bt optionomer@linux.localdomain2007-04-171-0/+4
* | | Only list "scripts" once in SUBDIRSmsvensson@pilot.blaudden2007-04-231-2/+2
* | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@qualinost.(none)2007-04-181-2/+0
|\ \ \
| * | | Fixed make distcheck problem. mtaylor@qualinost.(none)2007-04-181-2/+0
* | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-181-2/+2
|\ \ \ \
| * \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-181-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrademsvensson@pilot.blaudden2007-04-181-2/+2
| | |\ \ \
| | | * | | Bug#25452 mysql_upgrade access deniedmsvensson@pilot.blaudden2007-04-181-2/+2
* | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintmtaylor@qualinost.(none)2007-04-171-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | BUG#27769 - MySQL should include debian packaging dirmtaylor@qualinost.(none)2007-04-171-0/+2
| |/ / /
* | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debianmtaylor@qualinost.(none)2007-04-111-1/+1
|\ \ \ \ | |/ / /
| * | | Adding files to support building for debian.mtaylor@qualinost.(none)2007-04-111-1/+2
| | |/ | |/|
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508msvensson@pilot.blaudden2007-04-111-40/+0
|\ \ \
| * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libeditmsvensson@pilot.blaudden2007-03-271-40/+0
* | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-281-3/+15
* | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-281-0/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-03-271-0/+10
| |\ \ \
| | * | | mysql.spec.sh, Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-271-0/+6
| * | | | Added test options to Makefile.am includingomer@linux.site2007-03-151-4/+32
| | |_|/ | |/| |
| * | | Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: targettsmith@siva.hindu.god2007-01-231-0/+1
| * | | Makefile.am: Fix previous bad merge. Re-enable the test-ps target.tsmith@siva.hindu.god2007-01-181-0/+1
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-111-3/+3
| |\ \ \
| * \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-261-2/+1
| |\ \ \ \
* | | | | | Modifications to Makefile.am to include new test options omer@linux.site2007-03-161-4/+45
| |_|_|_|/ |/| | | |
* | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-241-8/+0
|\ \ \ \ \
| * | | | | Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)malff/marcsql@weblab.(none)2007-01-241-8/+0
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-071-7/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-261-7/+9
| |\ \ \ \ \
| | * \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50tsmith/tim@siva.hindu.god2006-12-081-7/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41tsmith/tim@siva.hindu.god2006-12-081-12/+28
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Makefile.amtsmith/tim@siva.hindu.god2006-12-081-25/+26
| | | | * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-12-041-0/+1
| | | | |\ \ \
| | | | * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-281-0/+6
| | | | |\ \ \ \
* | | | | \ \ \ \ Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-311-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-311-1/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| |/ / / /
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-041-9/+14
| |\ \ \ \
| * \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-281-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-11-131-15/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Remove test-force-pl-mem and add test-force-memmsvensson@neptunus.(none)2006-11-131-4/+6
* | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-12-021-11/+13
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | mysql_install_db.sh:kent@mysql.com/kent-amd64.(none)2006-12-021-11/+13
* | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marveldf@kahlann.erinye.com2006-12-011-0/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-11-291-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | | | |_|_|/ | | | |/| | |
| | | * | | | mergingholyfoot/hf@mysql.com/deer.(none)2006-11-161-1/+1