summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-10608-6031/+210493
|\
| * Merge with main Maria treeMichael Widenius2008-12-0912-31/+120
| |\
| | * Fix for BUG#41159 "Maria: deadlock between checkpoint and maria_write() when ...Guilhem Bichot2008-12-098-13/+71
| | * mergeunknown2008-12-087-18/+49
| | |\
| | | * Fixed mutexes lock order in maria_close(): LOCK_trn_list -> MARIA_SHARE::inte...unknown2008-12-087-18/+49
| * | | Merge with base Maria treeMichael Widenius2008-12-0929-89/+319
| |\ \ \ | | |/ /
| | * | mergeunknown2008-12-081-5/+20
| | |\ \
| | | * | False alarm about incorrect mutex taking removed.unknown2008-12-081-5/+20
| | * | | merge with latest 5.1-mariaGuilhem Bichot2008-12-0513-9/+201
| | |\ \ \
| | | * | | Fix for BUG#41037 "Maria: recovery failure (pushbuild2)" (checkpoint bug).Guilhem Bichot2008-12-059-8/+166
| | | * | | Fix for BUG#41102 "Maria: maria-no-logging.test fails randomly on Win64"Guilhem Bichot2008-12-054-1/+35
| | | |/ /
| | * | | compilation warningsSergei Golubchik2008-12-052-2/+2
| | * | | mergedSergei Golubchik2008-12-0541-187/+1065
| | |\ \ \ | | | |/ /
| | | * | Fix for pushbuild failure (test which can't run in embedded mode) and compile...Guilhem Bichot2008-12-052-0/+4
| | | * | Fixing Valgrind error: deadlock detector was set to random; seen in many Inno...Guilhem Bichot2008-12-041-4/+5
| | * | | bug#41024 maria: Server crashes in sysbench OLTP_RW test at lf_hash.c:94Sergei Golubchik2008-12-051-4/+5
| | * | | bug#40416 - Maria: Memory allocated at trnman.c:129 was underrun.Sergei Golubchik2008-12-051-5/+11
| | * | | dbug fix: only do safemalloc checks if a function is selectedSergei Golubchik2008-12-025-46/+54
| * | | | Fixed problem with crash in Maria _ma_setup_live_state() where history link d...Michael Widenius2008-12-083-5/+18
| | |/ / | |/| |
| * | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-048-11/+14
| * | | Merge with base MySQL-5.1-mariaMichael Widenius2008-12-03417-214143/+243156
| |\ \ \
| | * | | Do not use MY_WME in the stat call which errors we process on high level.unknown2008-12-013-1/+33
| | |/ /
| | * | Bug#34374: mysql generates incorrect warningSergei Golubchik2008-11-294-8/+24
| | * | Fix for BUG#40661 "Maria: crash in embedded server (when detecting deadlock?)"Guilhem Bichot2008-11-274-38/+41
| | |/
| | * Fix of the small merge bug.unknown2008-11-251-1/+2
| | * Manually applying the patch for BUG40954 "Crash in MyISAM index code with con...Guilhem Bichot2008-11-253-1/+29
| | * Two tests which I recently copied from MyISAM to Maria take much longer in Ma...Guilhem Bichot2008-11-242-0/+6
| | * In pushbuild2 when testing Maria's recovery, it can happen that a page was no...Guilhem Bichot2008-11-241-1/+2
| | * Under Windows one can get \ instead of / in file names in error messages (fix...Guilhem Bichot2008-11-241-5/+5
| | * mergeunknown2008-11-243-3/+9
| | |\
| | | * Prevent reenabling logging by thread which tries to lock table used by bulk i...unknown2008-11-243-3/+9
| | * | post-merge fix (compiler warning)Guilhem Bichot2008-11-221-1/+0
| | * | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-21400-214043/+242921
| | |\ \
| | * | | During Maria's checkpoint, use the proper mutex to read transaction's short_idGuilhem Bichot2008-11-201-1/+4
| | | |/ | | |/|
| | * | Added correct reaction on find operation status during writing the page. (BUG...unknown2008-11-131-15/+30
| | |\ \
| | | * | Added correct reaction on find operation status during writing the page. (BUG...unknown2008-11-121-15/+30
| | * | | compile_time_assertSergei Golubchik2008-11-101-0/+2
| | * | | mergeSergei Golubchik2008-11-0713-78/+191
| | |\ \ \
| | * | | | commentSergei Golubchik2008-11-041-1/+25
| | * | | | don't use #pragma packSergei Golubchik2008-11-033-12/+9
| * | | | | Add missing file: Testing of mutex-wrong-usage-detectorMichael Widenius2008-12-031-0/+162
| * | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-0334-146/+832
| * | | | | Remove not used signal handling for ending a threadMichael Widenius2008-12-021-25/+13
| | |/ / / | |/| | |
| * | | | Fix for bug: Bug #40391 Maria deadlock in trnman_get_min_trid , trnman_end_trnMichael Widenius2008-11-051-15/+16
| * | | | Fixed that packed transid can be compared byte per byte and we get them in in...Michael Widenius2008-11-044-16/+42
| * | | | Automatic mergeMichael Widenius2008-11-031-45/+101
| |\ \ \ \
| | * \ \ \ mergeunknown2008-11-039-1/+28
| | |\ \ \ \
| | * \ \ \ \ mergeunknown2008-10-311-45/+101
| | |\ \ \ \ \
| | | * | | | | Fix for BUG#37737.unknown2008-07-231-45/+101
| * | | | | | | Fixed bug introduced in last push.Michael Widenius2008-11-033-4/+7
| | |_|/ / / / | |/| | | | |