summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-2557-1683/+6135
|\
| * Automerge with 5.2Michael Widenius2010-11-053-61/+152
| |\
| | * Automatic merge with 5.1Michael Widenius2010-11-043-61/+152
| | |\
| | | * Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-0/+1
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-023-61/+151
| * | | mergeSergei Golubchik2010-11-021-159/+2
| |\ \ \
| | * \ \ merge w/ 5.2Sergei Golubchik2010-11-021-159/+2
| | |\ \ \ | | | |/ /
| | | * | merge w/ 5.1Sergei Golubchik2010-10-291-0/+2
| | | |\ \ | | | | |/
| | | * | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-159/+0
| * | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-022-0/+26
| |/ / /
| * | | 5.2 mergeSergei Golubchik2010-10-281-12/+15
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-10-251-12/+15
| | |\ \ | | | |/
| | | * 5.1.51 mergeSergei Golubchik2010-10-191-12/+15
| | | |\
| * | | \ Merge 5.2->5.3Sergey Petrunya2010-10-1024-153/+282
| |\ \ \ \ | | |/ / /
| | * | | Automatic merge with 5.1Michael Widenius2010-10-061-81/+98
| | |\ \ \ | | | |/ /
| | | * | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i...Michael Widenius2010-10-061-81/+98
| | * | | merge with 5.1Sergei Golubchik2010-09-161-1/+1
| | |\ \ \ | | | |/ /
| | | * | mysqltest now gives error messages with error code for my_delete, my_rename, ...Michael Widenius2010-09-151-1/+1
| | * | | merge with 5.1Sergei Golubchik2010-09-1112-39/+87
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.50Michael Widenius2010-08-2712-39/+87
| | | |\ \
| | * | \ \ Automerge with 5.1Michael Widenius2010-08-251-5/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | missing DBUG_RETURNsSergei Golubchik2010-08-141-5/+5
| | * | | | Merge with 5.1Michael Widenius2010-08-111-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed typo that caused compile failure on MacMichael Widenius2010-08-101-1/+1
| | * | | | Merge with 5.1 to get in critical bug fix that caused Aria tests to failMichael Widenius2010-08-101-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Ignore ENOLCK errno from FreeBSD (known problem in old FreeBSD releases)Michael Widenius2010-08-091-0/+2
| | * | | | Merge with 5.2Michael Widenius2010-08-092-0/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Added --sync-sys=0 option for mysqld to skip sync() calls for faster testingMichael Widenius2010-08-092-0/+4
| | * | | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-073-4/+4
| | * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-058-29/+84
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ...Michael Widenius2010-08-041-0/+18
| | | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-026-28/+65
| | | |\ \ \
| | | * | | | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-1/+1
| | * | | | | buildbot detected problemsSergei Golubchik2010-07-241-1/+1
| | * | | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+2
| * | | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-162-588/+223
| |/ / / / /
| * | | | | merge 5.1->5.2Sergei Golubchik2010-06-019-14/+39
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-261-2/+1
| | * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-264-8/+22
| | |\ \ \ \
| | * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-284-4/+16
| | |\ \ \ \ \
| * | | | | | | first initialize variable, then use it, not the other way aroundSergei Golubchik2010-05-271-1/+1
| * | | | | | | fix a warningSergei Golubchik2010-04-061-1/+1
| * | | | | | | Post review fixes.Igor Babaev2010-04-051-18/+55
| * | | | | | | Merge with the latest changes of 5.2Igor Babaev2010-04-032-3/+12
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Auto merge with 5.1Michael Widenius2010-04-011-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Added missing space from last pushMichael Widenius2010-03-311-1/+1
| | * | | | | | | Merge with 5.1Michael Widenius2010-04-012-3/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Removed compiler warningMichael Widenius2010-03-302-3/+12
| * | | | | | | | Post-review fixes.Igor Babaev2010-04-011-486/+460