summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge XtraDB 6 with latest MariaDB 5.1unknown2009-08-03306-0/+202252
|\
| * Merge XtraDB 6 into MariaDB.unknown2009-08-0343-506/+2476
| * More XtraDB after-merge fixes following review and buildbot runs:unknown2009-06-221-6/+1
| * Fix test cases after merge of XtraDB into MariaDB.unknown2009-06-183-19/+38
| * Merge of Percona XtraDB into MariaDB.unknown2009-06-11306-0/+200268
| |\
| | * Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-1126-1474/+576
| | * XtraDB after-merge fixes.unknown2009-06-096-74/+57
| | * XtraDB after-merge fixes.unknown2009-06-0959-12506/+0
| | * XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-098-3531/+37
| | * Import Percona XtraDB into the MariaDB source tree.unknown2009-06-09367-0/+217183
* | | Changed default thread stack to 288K to get better memory missalignment betwe...Michael Widenius2009-06-301-10/+23
* | | Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-303-18/+33
|/ /
* | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-36/+4
* | Fixed problems in mergeMichael Widenius2009-05-1919-31/+39
|\ \
| * \ Merge Toby Thain's Solaris fixes.unknown2009-05-114-11/+19
| |\ \ | | |/ | |/|
| | * Portability changes for Solaris 10 (amd64). Re-hash BUILD/ scripts for Solari...Toby Thain2009-05-094-11/+19
| * | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-0616-20/+20
| |/
* | Merge fixes.Michael Widenius2009-05-122-2/+2
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-2519-80/+84
|\ \
| * | Add new headers to noinst_HEADERS (ibmdb2i storage engine)MySQL Build Team2009-04-011-0/+1
| * | fixed archive test. It might be OOM error on boxes with low amount of memory.Sergey Glukhov2009-03-261-1/+5
| * | compiler warning fixSergey Glukhov2009-03-244-33/+34
| * | fixed compilation warnings. addendum to the fix for bug 29125Georgi Kodinov2009-03-201-2/+2
| * | auto-mergeIgnacio Galarza2009-03-191-4/+2
| |\ \
| | * \ merge to 5.1-bugteam branchSatya B2009-03-1842-66/+17849
| | |\ \
| | * | | Fix for BUG#32880 - Repairing Archive table fails with internal error 144Satya B2009-03-181-4/+2
| * | | | auto-mergeIgnacio Galarza2009-03-1748-76/+17945
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-1316-41/+41
* | | | | bzr merge from guilhem's maria tree to our local 5.1mariadb-merge-mysql-5.1.34plusMichael Widenius2009-04-2554-104/+17995
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-0150-76/+17950
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Applying InnoDB snashot 5.1-ss4350, part 5. FixesTimothy Smith2009-03-111-5/+7
| | * | | Applying InnoDB snashot 5.1-ss4350, part 4. FixesTimothy Smith2009-03-111-1/+7
| | * | | Applying InnoDB snashot 5.1-ss4350, part 3. No functional changes.Timothy Smith2009-03-111-4/+4
| | * | | Applying InnoDB snashot 5.1-ss4350, part 2. FixesTimothy Smith2009-03-111-2/+10
| | * | | Applying InnoDB snashot 5.1-ss4350, part 1. FixesTimothy Smith2009-03-111-2/+10
| | * | | Merge 5.1-ibmdb2isee to 5.1-bugteam.Sergey Vojtovich2009-03-1032-0/+17731
| | |\ \ \
| | | * | | Import the ibmdb2i-ga4-src snapshot from IBMTimothy Smith2009-03-0918-301/+837
| | | * | | Add the IBM DB2 for i storage engine.Timothy Smith2009-02-1532-0/+17195
| | | |/ /
| | * | | fixing warning during compilation.Anurag Shekhar2009-03-091-1/+1
| | * | | Bug#41305 server crashes when inserting duplicate row into a merge tableAnurag Shekhar2009-03-041-0/+10
| | * | | Applying InnoDB snashot 5.1-ss4007, part 2. FixesTimothy Smith2009-03-021-3/+12
| | * | | Applying InnoDB snashot 5.1-ss4007, part 1. FixesTimothy Smith2009-03-022-17/+13
| | * | | Applying InnoDB snashot 5.1-ss3931, part 2. FixesTimothy Smith2009-03-021-4/+4
| | * | | Applying InnoDB snashot 5.1-ss3931, part 1. FixesTimothy Smith2009-03-023-28/+41
| | | |/ | | |/|
| | * | Bug #38103 myisamchk: --help output incompleteAnurag Shekhar2009-02-241-0/+1
| | * | merging.Alexey Botchkov2009-02-241-2/+1
| | * | merging.Alexey Botchkov2009-02-241-0/+2
| | |\ \
| | | * | Bug#40634 table scan temporary table is 4x slower due to mmap instead instead...Alexey Botchkov2008-11-201-0/+2
| | * | | merging with changes in bugteam branch.Anurag Shekhar2009-02-233-0/+12
| | |\ \ \
| | | * | | Bug#41098: Query Cache returns wrong result with concurrent insertDavi Arnaut2009-02-193-0/+12