summaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-40/+54
|\
| * merge with 5.1Sergei Golubchik2010-09-111-4/+1
| |\
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+1
| | |\
| * | \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-2/+2
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+2
| | |\ \
| * | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-5/+6
| * | | | make force really forceSergei Golubchik2010-02-191-4/+4
| * | | | mwl:98 - libservicesSergei Golubchik2010-03-031-2/+2
| |/ / /
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-4/+0
| |\ \ \
| * | | | After-merge fixes for MySQL 5.1.41 merge into MariaDB.unknown2009-11-231-3/+1
| * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+8
| |\ \ \ \
| * | | | | Modify the `test-bt` target for OurDelta packaging.unknown2009-10-111-2/+2
| * | | | | Add a simple way to robustly get the name of the generated source tarball, so...unknown2009-10-021-0/+5
| * | | | | Add environment variable MTR_EXTRA_OPTIONS to influence `make test*` targets.unknown2009-09-301-33/+36
| * | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-3/+4
| * | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-4/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-26/+110
| |\ \ \ \ \ \
| * | | | | | | changes for big unit testsunknown2008-01-291-2/+5
| * | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-1/+1
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-10-081-1/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-1/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-1/+1
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | After merge fixesunknown2007-01-261-2/+2
* | | | | | | | | | | | | | BUG#52821 - plugin_ftparser.h and plugin_audit.h areSergey Vojtovich2010-08-271-1/+2
* | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-201-1/+1
| * | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-201-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Bug#55169: Installer does not preserve user's settings in custom modeVladislav Vaintroub2010-07-241-0/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-2/+2
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | BUG#50410: rpl_ndb tests should run with binlog_format=rowSven Sandberg2010-05-121-2/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | | | | | | | | | | | Merging with mysql-trunk-bugfixingMats Kindahl2010-04-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#51607: Automake distcheck target broken.Vladislav Vaintroub2010-03-091-1/+2
* | | | | | | | | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-7/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \