summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* merge.Sergei Golubchik2010-11-253-23/+482
|\
| * mergedSergei Golubchik2010-09-211-2/+2
| |\
| | * bug in plugin.m4 that prevented group list in the MYSQL_PLUGIN declaration fr...Sergei Golubchik2010-09-181-2/+2
| * | extended configure script to report plugin configuration summary.Sergei Golubchik2010-09-211-11/+17
| * | merge with 5.1Sergei Golubchik2010-09-161-0/+8
| |\ \ | | |/
| | * don't build dynamic plugins when configured with --disable-shared.Sergei Golubchik2010-09-141-0/+8
| * | MYSQL_PLUGIN_WITHOUT() macro for plug.inSergei Golubchik2010-09-141-0/+24
| * | merge with 5.1Sergei Golubchik2010-09-111-0/+64
| |\ \ | | |/
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-0/+64
| | |\
| * | \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-1/+10
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-1/+10
| | |\ \
| * | | | Maria WL#61unknown2010-04-011-1/+1
| * | | | tell autoconf about --with-plugin options to avoidSergei Golubchik2010-03-291-0/+1
| |/ / /
| * | | now we force at least libevent-1.4Sergei Golubchik2010-01-301-4/+4
| * | | Support building with system libeventSergei Golubchik2010-01-291-18/+58
| * | | Merge fix for PBXT running inside embedded server (MBug#439889).unknown2009-12-221-6/+7
| |\ \ \
| | * | | fixed bug #439889: Embedded server asserts on startup because of pbxtVladimir Kolesnikov2009-12-091-5/+7
| |/ / /
| * | | Used the correct path to the bundled libevent includes.Peter Lieverdink2009-09-301-1/+1
| * | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-3/+3
| |\ \ \
| | * | | Fix most Compiler warnings seen in buildbot.unknown2009-09-031-3/+3
| * | | | Merge MySQL->MariaDBSergey Petrunya2009-09-082-11/+61
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-37/+20
| |\ \ \ \
| * \ \ \ \ bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-21/+51
| |\ \ \ \ \
| | * \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-21/+51
| | |\ \ \ \ \
| * | | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-132-0/+379
| |/ / / / / /
| * | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-1/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-4/+4
| |\ \ \ \ \ \ \
| * | | | | | | | use "default" plugin configuration by default, not "none".Sergei Golubchik2008-06-051-3/+3
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-merge.Davi Arnaut2010-09-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-09-241-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Bug #55547 InnoDB is not included when configuring by defaultMagne Mahre2010-08-181-1/+1
* | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-08-061-1/+1
* | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+0
* | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-19/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-19/+13
* | | | | | | | | | mergeMattias Jonsson2010-07-091-2/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Remove AC_LANG_WERROR, it causes trouble earlier versionsDavi Arnaut2010-07-091-2/+0
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-091-0/+66
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-091-0/+66
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-081-1/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-081-1/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#34236: Various possibly related SSL crashesDavi Arnaut2010-06-081-0/+6
| * | | | | | | | auto-mergeTimothy Smith2009-11-041-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix for Bug#40700: aclocal warnings for missing cache-id'sTimothy Smith2009-11-041-3/+3
* | | | | | | | Backporting WL#1213Alexander Barkov2010-02-241-4/+61
* | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-1/+5
* | | | | | | | Bug#40700: aclocal warnings for missing cache-id'sMagne Mahre2009-11-111-3/+3
* | | | | | | | bug#45810: DTrace: build fails when 'dtrace' is not in PATHJonathan Perkin2009-10-141-1/+1
* | | | | | | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-122-6/+53
|\ \ \ \ \ \ \ \ | |/ / / / / / /