summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge XtraDB 6 with latest MariaDB 5.1unknown2009-08-033-3/+7
|\
| * Cherry-pick revid:psergey@askmonty.org-20090608135546-ut1yrzbah4gdw6e6unknown2009-06-151-1/+2
| * Merge of Percona XtraDB into MariaDB.unknown2009-06-112-2/+5
| |\
| | * Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-0/+3
| | |\
| | | * sync rev 59Vadim Tkachenko2009-05-031-2/+2
| | | * disable split_buffer_pool_mutexVadim Tkachenko2009-05-037-95/+45
| | | * sync to extension rev 58release-5Vadim Tkachenko2009-04-264-312/+13
| | | * sync to extension rev 55Vadim Tkachenko2009-04-251-33/+24
| | | * added innodb_overwrite_relay_log_info.patchVadim Tkachenko2009-04-072-1/+21
| | | * added innodb_overwrite_relay_log_info.patchVadim Tkachenko2009-04-071-2/+2
| | | * porting to 1.0.3Vadim Tkachenko2009-03-25192-1120/+4385
| | | * sync rev46release-1.0.2-3Vadim Tkachenko2009-02-241-3/+1
| | | * sync with rev41 extensionsVadim Tkachenko2009-02-026-12/+21
| | | * sync with rev40 extensions-1.0Vadim Tkachenko2009-01-297-12/+39
| | | * sync rev31 extensionsVadim Tkachenko2009-01-153-0/+6
| | | * sync with extensions rev29Vadim Tkachenko2009-01-121-0/+4
| | | * sync with extensions rev 23release-1.0.2-2Vadim Tkachenko2008-12-237-12/+24
| | | * sync with extensions rev18Vadim Tkachenko2008-12-167-31/+57
| | | * Sync optimistic_margine_countVadim Tkachenko2008-12-111-1/+2
| | | * real sync with patches rev12release-1.0.2-rc1Vadim Tkachenko2008-12-107-42/+319
| | | * sync with patches rev12Vadim Tkachenko2008-12-107-319/+42
| | | * sync with patches rev10Vadim Tkachenko2008-12-081-2/+2
| | | * Sync with patches commit rev 8Vadim Tkachenko2008-12-066-40/+308
| | | * innodb_io_patches.patch mergedVadim Tkachenko2008-12-044-281/+48
| | | * 1.0.2 version importedVadim Tkachenko2008-12-0240-252/+541
| | | * rw_locks appliedVadim Tkachenko2008-11-302-37/+279
| | | * Initial import of InnoDB-plugin 1.0.1 source treeVadim Tkachenko2008-11-30191-0/+46240
| | * Fix XtraDB to build with atomic operations, for good performance.unknown2009-06-101-2/+2
* | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-0/+2
* | | Changed default thread stack to 288K to get better memory missalignment betwe...Michael Widenius2009-06-301-1/+1
* | | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-302-7/+3
|/ /
* | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-0/+4
* | Fixed problems in mergeMichael Widenius2009-05-192-13/+13
|\ \ | |/
| * We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-062-13/+13
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+5
|\ \
| * | Apply http://lists.mysql.com/commits/70427 to fix Win32 builds with VS 2005.Jonathan Perkin2009-04-021-3/+0
| * | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-201-3/+5
| * | Merge contributed automake changes, and 5.1 upstream.Chad MILLER2009-03-191-0/+3
| |\ \
| | * \ auto-mergeIgnacio Galarza2009-03-191-2/+5
| | |\ \
| | * \ \ auto-mergeIgnacio Galarza2009-03-175-77/+64
| | |\ \ \
| | * \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-0/+3
| | |\ \ \ \
| | | * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| * | | | | | Copy include/config.h to include/my_config.h at configure-time. Also,Chad MILLER2009-03-191-5/+3
| | |_|_|/ / | |/| | | |
| * | | | | Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
* | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-256-82/+66
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-015-77/+64
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge of bug 42434 to 5.1-bugteamGeorgi Kodinov2009-03-111-64/+26
| | |\ \ \ \
| | | * | | | Bug #42434: license of mysys MD5 implementation is not GPL-compatibleGeorgi Kodinov2009-03-091-64/+26
| | * | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
| | |\ \ \ \ \ | | | |/ / / /