summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-251-7/+3
|\
| * don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-251-3/+3
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-4/+0
* | mergeVladislav Vaintroub2009-12-161-4/+0
|\ \ | |/
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-4/+0
| |\
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-3/+4
| | |\
| | * \ Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-4/+0
| | |\ \
| | | * | removed a duplicate make targetGeorgi Kodinov2009-11-101-4/+0
* | | | | mergeVladislav Vaintroub2009-12-041-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | WL#2360 Performance schemaMarc Alff2009-11-301-4/+5
| | |_|/ | |/| |
* | | | automergeVladislav Vaintroub2009-11-131-0/+6
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-2/+2
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | mergeGeorgi Kodinov2009-10-301-0/+6
| | | |\ \
| | | | * | Added make targets 'test-bt-fast' and 'test-bt-debug-fast'Hery Ramilison2009-10-151-0/+6
| | * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-2/+2
| | |\ \ \ \ | | | |/ / /
* | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-3/+6
| |_|_|_|/ |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Adding funcs_1 into "make test"Alexander Nozdrin2009-10-151-1/+2
* | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-2/+2
|/ / / /
* | | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-011-16/+18
|\ \ \ \ | |/ / /
| * | | 1. Respect experimental tag in gcov mode;Alexander Nozdrin2009-10-011-16/+18
* | | | Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-281-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix bug#46980Joerg Bruehe2009-09-171-2/+2
* | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-171-4/+23
|\ \ \ | |/ /
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-081-4/+19
| |\ \
| | * | mysql-test/r/partition.resultBuild Team2008-11-251-1/+1
| | * | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| | * | Back merges from 6.0.8unknown2008-11-061-3/+18
| * | | MergeMagnus Svensson2008-10-081-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | WL#4189 Add smoke targetMagnus Svensson2008-10-081-0/+4
* | | | A number of fixes to DTrace patchMikael Ronstrom2008-12-201-2/+2
|/ / /
* | | merging mysql-5.1->mysql-5.1-seaNarayanan V2008-09-041-1/+2
|\ \ \ | |/ /
| * | Fix path to myisamchk for mysql-5.1Jonathan Perkin2008-08-201-1/+1
| * | bug#33300: use myisamchk to verify that mysql_install_db hasJonathan Perkin2008-08-201-1/+2
* | | WL#4380Narayanan V2008-08-081-2/+2
* | | WL#4380Narayanan V2008-08-061-8/+7
* | | WL#4380Narayanan V2008-07-231-1/+1
* | | WL#4380Narayanan V2008-07-221-5/+12
* | | WL#4380Narayanan V2008-07-211-1/+1
* | | WL#4380Narayanan V2008-07-181-5/+8
* | | WL#4380Narayanan V2008-07-151-0/+2
* | | WL#4380Narayanan V2008-07-101-15/+25
* | | WL#4380Thava Alagu2008-07-091-0/+57
|\ \ \ | |/ / |/| |
| * | WL#4380Narayanan V2008-06-171-0/+57
* | | Upmerge of fix forMatthias Leich mleich@mysql.com2008-06-031-2/+2
|\ \ \ | |/ / |/| / | |/
| * Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla buildsMatthias Leich mleich@mysql.com2008-06-021-2/+2
| * Merge debian.(none):/MySQL/M50/indent-5.0unknown2007-12-111-17/+17
| |\
| | * Makefile.amunknown2007-12-101-17/+17