summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@mysql.com2005-11-051-21/+20
|\
| * Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-11-031-2/+2
| |\
| | * Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0jani@ua141d10.elisa.omakaista.fi2005-11-031-2/+2
| | |\
| | | * Added test-force to Makefile.jani@ua141d10.elisa.omakaista.fi2005-11-031-0/+4
| | * | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadkent@mysql.com2005-10-251-17/+10
| | |\ \ | | | |/
| * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadkent@mysql.com2005-10-251-21/+20
| |\ \ \ | | | |/ | | |/|
| | * | Makefile.am:kent@mysql.com2005-10-251-9/+8
* | | | Mergetomas@poseidon.ndb.mysql.com2005-10-061-4/+15
|\ \ \ \ | |/ / /
| * | | portability.h:kent@mysql.com2005-09-291-13/+19
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-8/+13
| |\ \ \ | | | |/ | | |/|
| | * | Makefile.am:kent@mysql.com2005-09-241-2/+13
| | * | Manual merge.joerg@mysql.com2005-09-011-0/+5
| | |\ \
| | | * | Correct a typing error: Missing ".pl" suffix is essential.joerg@mysql.com2005-08-251-1/+1
| | | * | Add the "test-force" target to "Makefile.am".joerg@mysql.com2005-08-231-1/+7
* | | | | Mergendbdev@dl145c.mysql.com2005-09-061-6/+0
|\ \ \ \ \ | |/ / / /
| * | | | Removed redundant case in Makefile.amlars@mysql.com2005-09-021-6/+0
* | | | | Merge zim.(none):/home/brian/mysql/mysql-5.0brian@zim.(none)2005-08-301-3/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1kent@mysql.com2005-08-281-3/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2005-08-281-2/+17
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Makefile.am:kent@mysql.com2005-08-281-3/+10
* | | | Mergetomas@poseidon.ndb.mysql.com2005-07-121-4/+4
|\ \ \ \ | |/ / /
| * | | Merge with 4.1monty@mysql.com2005-07-031-1/+1
| |\ \ \ | | |/ /
| | * | Makefile.am:kent@mysql.com2005-06-281-1/+1
| * | | - reverted to using the shell version of mysql-test-run for "make test" until...lenz@mysql.com2005-06-231-3/+3
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tulin@dl145b.mysql.com2005-06-201-3/+4
|\ \ \ \ | |/ / /
| * | | Mergekent@mysql.com2005-06-201-3/+4
| |\ \ \ | | |/ /
| | * | Makefile.am:kent@mysql.com2005-06-201-1/+1
* | | | Mergetomas@poseidon.ndb.mysql.com2005-05-311-2/+2
|\ \ \ \ | |/ / /
| * | | - fixed the "test-force" target in the toplevel Makefile.am for systems on whichlenz@mysql.com2005-05-271-2/+2
* | | | make dist target fixestulin@dl145c.mysql.com2005-05-161-3/+5
|/ / /
* | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-05-011-0/+5
|\ \ \
| * | | After merge fixesmonty@mysql.com2005-04-301-0/+5
* | | | WL#2286 Compile MySQL w/YASSL supportsvoj@mysql.com2005-04-281-1/+1
|/ / /
* | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants...brian@zim.(none)2005-03-161-2/+2
* | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-2/+2
|\ \ \ | |/ /
| * | Clean up the handling of "server" and "client" directories, while still avoid...joerg@mysql.com2004-12-301-2/+2
* | | Merge with 4.1monty@mishka.local2004-12-221-1/+1
|\ \ \ | |/ /
| * | - a fix for the fix - now "make test" will run the test suite with andlenz@mysql.com2004-12-131-5/+1
| * | Makefile.am:mwagner@here.mwagner.org2004-12-131-2/+2
| * | Makefile.am:mwagner@here.mwagner.org2004-12-131-1/+4
* | | Mergeguilhem@mysql.com2004-11-161-4/+4
|\ \ \ | |/ /
| * | changed compile order, mysqladmin with ndbcluster extensions needs ndb to...tomas@poseidon.ndb.mysql.com2004-11-151-4/+4
* | | merge with 4.1monty@mysql.com2004-10-291-1/+1
|\ \ \ | |/ /
| * | Merge with 4.0 for 4.1 releasemonty@mysql.com2004-10-061-1/+1
| |\ \ | | |/
| | * added --without-man option similar to --without-docshartmut@mysql.com2004-09-261-1/+1
* | | After merge fixes of merge with 4.1 that included the new arena code.monty@mysql.com2004-09-091-0/+2
|/ /
* | manually mergedserg@serg.mylan2004-08-181-1/+1
|\ \ | |/
| * - rename: EXCEPTIONS->EXCEPTIONS-CLIENTlenz@mysql.com2004-08-051-1/+1
| * - More changes to include the FLOSS License Exception in thelenz@mysql.com2004-08-051-1/+1
* | WL#1518, "make bundled zlib usable for unix builds": konstantin@mysql.com2004-07-241-2/+9