summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Makefile.am: Fix previous bad merge. Re-enable the test-ps target.unknown2007-01-181-0/+1
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-111-3/+3
|\
| * my_strtoll10-x86.s:unknown2006-12-311-1/+3
* | Merge siva.hindu.god:/usr/home/tim/m/bk/g50unknown2006-12-261-2/+1
|\ \ | |/
| * Many files:unknown2006-12-231-2/+1
* | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41unknown2006-12-081-12/+28
|\ \ | |/ |/|
| * Makefile.amunknown2006-12-081-25/+26
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-12-041-0/+1
| |\
| * \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-11-281-0/+6
| |\ \
* | \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-12-041-9/+14
|\ \ \ \
| * | | | mysql_install_db.sh:unknown2006-12-021-11/+13
| * | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildunknown2006-11-291-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Makefile.am:unknown2006-11-291-0/+1
| | | |/ | | |/|
| | * | mergingunknown2006-11-161-1/+1
| * | | Makefile.am:unknown2006-11-291-1/+2
| * | | Makefile.am:unknown2006-11-291-0/+1
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-11-281-0/+1
|\ \ \ \ | |/ / /
| * | | Merge bk@192.168.21.1:mysql-5.0-optunknown2006-11-171-0/+1
| |\ \ \
| | * \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-optunknown2006-11-081-0/+6
| | |\ \ \ | | | |/ /
| | | * | Make a new test target for autopush.pl to run memory based testsunknown2006-11-081-0/+7
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-11-131-15/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Remove test-force-pl-mem and add test-force-memunknown2006-11-131-4/+6
* | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-10-141-0/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Back port change from 5.1 that adds the Windows database files to the source ...unknown2006-10-021-0/+10
* | | | Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_toolsunknown2006-10-061-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add target to Makefile which uses the much faster --mem switch to mysql-test-...unknown2006-10-051-0/+5
| |/
* | make dist changes for Cmake buildunknown2006-09-011-2/+2
* | Mergeunknown2005-11-041-16/+15
|\ \ | |/
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-16/+15
| |\
| | * Makefile.am, configure.in:unknown2005-09-241-16/+15
* | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-11-031-2/+2
|\ \ \ | |/ /
| * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2005-11-031-2/+2
| |\ \
| | * | Added test-force to Makefile.unknown2005-11-031-0/+4
| * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadunknown2005-10-251-17/+10
| |\ \ \ | | |/ / | | | / | | |/ | |/|
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadunknown2005-10-251-21/+20
|\ \ \ | | |/ | |/|
| * | Makefile.am:unknown2005-10-251-9/+8
* | | portability.h:unknown2005-09-291-13/+19
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-281-8/+13
|\ \ \ | | |/ | |/|
| * | Makefile.am:unknown2005-09-241-2/+13
| * | Manual merge.unknown2005-09-011-0/+5
| |\ \
| | * | Correct a typing error: Missing ".pl" suffix is essential.unknown2005-08-251-1/+1
| | * | Add the "test-force" target to "Makefile.am".unknown2005-08-231-1/+7
* | | | Removed redundant case in Makefile.amunknown2005-09-021-6/+0
* | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-08-281-3/+18
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2005-08-281-2/+17
| |\ \ \ | | |/ / | |/| / | | |/
| | * Makefile.am:unknown2005-08-281-3/+10
* | | Merge with 4.1unknown2005-07-031-1/+1
|\ \ \ | |/ /
| * | Makefile.am:unknown2005-06-281-1/+1
* | | - reverted to using the shell version of mysql-test-run for "make test" until...unknown2005-06-231-3/+3
* | | Mergeunknown2005-06-201-3/+4
|\ \ \ | |/ /