summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge 5.0-bugteam to 5.1-bugteamSatya B2009-03-251-0/+26
* 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
|\ \ \ | | |/ | |/|
| * | 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
| * | | | Bug#40321 ha_myisam::info could update rec_per_key incorrectlyAnurag Shekhar2009-02-131-1/+1
| |/ / /
| * | | Merge 5.1-bugteam -> 5.1-bugteam (local).Sergey Vojtovich2009-02-123-6/+77
| |\ \ \
| | * | | Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-123-6/+77
| | | |/ | | |/|
| * | | BUG#39185 - Cardinality for merge tables calculated incorrectly.Sergey Vojtovich2009-02-051-1/+2
| |/ /
* | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-1316-41/+41
|/ /
* | mergingAlexey Botchkov2009-02-052-13/+24
|\ \
| * \ auto-merge for BUG#42445.Alfranio Correia2009-02-041-4/+6
| |\ \
| | * | BUG#42445 Warning messages in innobase/handler/ha_innodb.ccAlfranio Correia2009-02-031-4/+6
| * | | Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-9/+18
| |/ /
* | | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-2/+2
|/ /
* | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-301-1/+1
|\ \
| * \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-2327-402/+959
| |\ \
| * \ \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-087-13/+9
| |\ \ \
| * \ \ \ merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-121-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-2/+36
| |\ \ \ \
| * \ \ \ \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-0619-100/+177
| |\ \ \ \ \
| * \ \ \ \ \ Merge 5.1 -> 5.1-rplSven Sandberg2008-07-061-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 5.1->5.1-rplMagnus Svensson2008-05-307-2/+46
| |\ \ \ \ \ \ \
| * | | | | | | | Revert faulty commitunknown2008-04-271-1/+1
| * | | | | | | | Add supression for expected warning(s) in slaves error logunknown2008-04-271-1/+1
* | | | | | | | | Fix for bug #37756: enabling fulltext indexes withRamil Kalimullin2009-01-265-52/+40
* | | | | | | | | Add another cast to ignore int/ulong difference in error types, silence warni...Timothy Smith2009-01-161-1/+1
* | | | | | | | | Applying InnoDB snapshot innodb-5.1-ss3603Timothy Smith2009-01-132-4/+6