summaryrefslogtreecommitdiff
path: root/include/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2.Michael Widenius2011-12-111-4/+5
|\
| * Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+5
| |\
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-6/+8
| | |\
| | | * BUG#12695969Luis Soares2011-07-121-1/+1
| | | |\
| | | | * BUG#12695969Luis Soares2011-07-121-1/+1
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | | | |\
| | | | | * Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0Magne Mahre2011-03-221-1/+1
| | | | |/
| | | * | Updated/added copyright headersKent Boortz2011-07-031-2/+2
| | | |\ \
| | | * \ \ Updated/added copyright headersKent Boortz2011-06-301-3/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | Fixed compilation & test issues found by buildbotMichael Widenius2011-07-021-1/+1
* | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-0/+1
* | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+1
* | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-281-1/+1
| | |/ /
* | | | merge 5.2Vladislav Vaintroub2011-03-101-2/+2
|\ \ \ \
| * \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-2/+2
| | |\ \ \ | | | |/ /
| | | * | MergeKent Boortz2010-12-291-2/+2
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-281-3/+3
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-1/+1
|/ / / /
* | | | merge with 5.1Sergei Golubchik2010-10-251-2/+3
|\ \ \ \ | |/ / /
| * | | 5.1.51 mergeSergei Golubchik2010-10-191-2/+3
| |\ \ \ | | |/ /
| | * | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-2/+3
* | | | merge with 5.1Sergei Golubchik2010-09-111-5/+3
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+2
| |\ \ \ | | |/ /
| | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-141-1/+1
| | * | Bug#22320: my_atomic-t unit test failsDavi Arnaut2010-07-051-4/+2
| | * | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-201-3/+5
| | * | Copy include/config.h to include/my_config.h at configure-time. Also,Chad MILLER2009-03-191-5/+3
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+1
|\ \ \ \ | |/ / /
| * | | Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-261-1/+1
* | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+3
* | | | mwl:98 - libservicesSergei Golubchik2010-03-031-2/+3
|/ / /
* | | Apply patch by Antony Dovgal:Michael Widenius2009-03-221-0/+2
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-5/+8
|\ \ \ | |/ /
| * | Bug#39571 abi_check Does not create all prerequisitesV Narayanan2008-10-271-5/+8
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-16/+3
|\ \ \ | |/ /
| * | WL#4380Narayanan V2008-07-181-0/+2
| * | WL#4380Thava Alagu2008-07-091-14/+0
| |\ \
| | * | Removed the references to mysql_h.ic in include/Makefile.amNarayanan V2008-06-181-14/+0
| * | | Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-181-1/+1
| |/ /
| * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-1/+1
| |\ \
| | * | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-1/+1
* | | | fixes for make distcheckSergei Golubchik2008-08-291-1/+2
* | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-1/+1
|\ \ \ \ | |/ / /
| * | | Post merge fix for BUG 33728unknown2008-01-111-1/+1
| |/ /
* | | Windows fixesunknown2008-01-101-1/+1
* | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-3/+3
|\ \ \ | |/ / |/| |