summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-5.1-cleanjimw@mysql.com2006-04-131-1/+1
|\ | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
| * Remove sql-bench from the server repository -- it is being maintainedjimw@mysql.com2006-04-131-2/+2
| | | | | | | | | | | | in a distinct mysql-bench repository. Also add a new --benchdir option to mysql-test-run.pl so the location of the mysql-bench repository can be specified. The default location is adjacent to the source tree.
* | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-newmats@mysql.com2006-04-131-1/+1
|\ \ | | | | | | | | | into mysql.com:/home/bkroot/mysql-5.1-new
| * \ Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-04-131-2/+2
| |\ \ | | |/ | |/| | | | into mysql.com:/home/bk/merge-mysql-5.1-wl3206
| | * WL#3206 (Adding unit tests):mats@mysql.com2006-04-061-2/+2
| | | | | | | | | | | | | | | | | | Moving mytap library into unittest/ Adding 'test' target to make and run unit tests. Minor fixes.
| | * WL#3206 (Adding unit tests):mats@mysql.com2006-04-051-1/+1
| | | | | | | | | | | | Added missing mytap/t/Makefile.am and minor fix to Makefile.am
| | * WL#3206 (Add unit tests):mats@mysql.com2006-04-041-1/+1
| | | | | | | | | | | | An implementation of the TAP framework for writing unit tests.
* | | mergedserg@serg.mylan2006-04-131-1/+1
|\ \ \ | |/ /
| * | Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,jimw@mysql.com2006-04-111-2/+2
| | | | | | | | | | | | | | | and various stuff in Docs/. Also move the certificates used for testing into mysql-test/std_data from the top-level SSL directory (now gone).
* | | Auto mergedserg@serg.mylan2006-04-121-11/+5
|\ \ \ | |/ / |/| |
| * | fixes for 'make dist' and 'make distcheck'serg@serg.mylan2006-04-121-11/+5
| | |
* | | Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-04-111-28/+11
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| * | | Step 1 in removing mysql-test-run.sh from 5.1 and upmsvensson@neptunus.(none)2006-04-101-28/+11
| |/ /
* | | Drop a number of OS2 specific files. brian@zim.(none)2006-04-101-1/+1
|/ /
* | Add some stuff to source package needed for CMake Windows packaging.knielsen@mysql.com2006-03-301-0/+8
| |
* | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-3/+3
|/ | | | a normal 'make dist' source .tar.gz.
* WL#2575 - Fulltext: Parser plugin for FTSsvoj@mysql.com2005-12-281-2/+4
| | | | Manual merge.
* WL#1012: All changes as one single changeset.lars@mysql.com2005-12-221-11/+39
| | | | This includes both code and test cases.
* Change for plugin storage engine to be built after mysqldacurtis@xiphis.org2005-12-211-0/+1
|
* Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2005-11-231-16/+15
|\ | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
| * Mergekent@mysql.com2005-11-041-16/+15
| |\
| | * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-041-16/+15
| | |\ | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
| | | * Makefile.am, configure.in:kent@mysql.com2005-09-241-16/+15
| | | | | | | | | | | | | | | | Enable "make distcheck" to work
* | | | Make storage engines "pluggable", handlerton workacurtis@poseidon.ndb.mysql.com2005-11-071-1/+2
| | | |
* | | | Merge mysql.com:/home/my/mysql-5.0monty@mysql.com2005-11-051-21/+20
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-11-031-2/+2
| |\ \ \ | | |/ / | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| | * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0jani@ua141d10.elisa.omakaista.fi2005-11-031-2/+2
| | |\ \ | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
| | | * | 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
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadkent@mysql.com2005-10-251-21/+20
| |\ \ \ | | | |/ | | |/| | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| | * | Makefile.am:kent@mysql.com2005-10-251-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | Option to set environment variable MTR_BUILD_THREAD to a small number, from what mysql-test-run calculate port numbers that will not conflict with other runs with different thread num
* | | | Mergetomas@poseidon.ndb.mysql.com2005-10-061-4/+15
|\ \ \ \ | |/ / /
| * | | portability.h:kent@mysql.com2005-09-291-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | Corrected OpenServer ifdef test Makefile.am: Added test-pl and test-force-pl targets
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-8/+13
| |\ \ \ | | | |/ | | |/| | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * | Makefile.am:kent@mysql.com2005-09-241-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert to shell test script for test targets mysqltest.c: Windows pclose() returns error code in low byte mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++
| | * | 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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-5.1 Resolved to minor issues.
| * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1kent@mysql.com2005-08-281-3/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| | * | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2005-08-281-2/+17
| | |\ \ \ | | | |/ / | | |/| / | | | |/ into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| | | * Makefile.am:kent@mysql.com2005-08-281-3/+10
| | | | | | | | | | | | | | | | Make ports configurable from environment for test
* | | | 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
| | | | | | | | | | | | | | | | Bug#9873, reenabled --without-man option to work
| * | | - reverted to using the shell version of mysql-test-run for "make test" ↵lenz@mysql.com2005-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | until the remaining bugs in the Perl version have been resolved
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tulin@dl145b.mysql.com2005-06-201-3/+4
|\ \ \ \ | |/ / / | | | | | | | | into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
| * | | Mergekent@mysql.com2005-06-201-3/+4
| |\ \ \ | | |/ /