summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-2544-865/+2606
|\
| * Automerge with 5.2Michael Widenius2010-11-052-7/+16
| |\
| | * Automatic merge with 5.1Michael Widenius2010-11-042-7/+16
| | |\
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-022-7/+16
| * | | mergeSergei Golubchik2010-11-021-12/+1
| |\ \ \
| | * \ \ merge w/ 5.2Sergei Golubchik2010-11-021-12/+1
| | |\ \ \ | | | |/ /
| | | * | merge w/ 5.1Sergei Golubchik2010-10-291-0/+1
| | | |\ \ | | | | |/
| | | * | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-12/+0
| * | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-021-1/+2
| |/ / /
| * | | 5.2 mergeSergei Golubchik2010-10-281-2/+3
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-10-251-2/+3
| | |\ \ | | | |/
| | | * 5.1.51 mergeSergei Golubchik2010-10-191-2/+3
| | | |\
| * | | | Post-merge fixes part 1Sergey Petrunya2010-10-101-1/+1
| * | | | Merge 5.2->5.3Sergey Petrunya2010-10-1024-126/+254
| |\ \ \ \ | | |/ / /
| | * | | Automatic merge with 5.1Michael Widenius2010-10-061-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i...Michael Widenius2010-10-061-2/+2
| | * | | fixes for gcc 4.5Sergei Golubchik2010-09-285-5/+6
| | * | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data...Michael Widenius2010-09-281-0/+1
| | * | | Rename control file and log files from maria_xxx to aria_xxx when upgrading f...Michael Widenius2010-09-271-3/+3
| | * | | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-142-6/+9
| | * | | merge with 5.1Sergei Golubchik2010-09-1110-55/+170
| | |\ \ \ | | | |/ /
| | | * | to simpliy and unify the codeSergei Golubchik2010-09-111-27/+17
| | | * | Merge with MySQL 5.1.50Michael Widenius2010-08-279-56/+177
| | | |\ \
| | * | \ \ Automerge with 5.1Michael Widenius2010-08-251-4/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Automatic mergeMichael Widenius2010-08-241-4/+4
| | | |\ \ \
| | | | * | | Increase some very old limits.Michael Widenius2010-08-241-2/+2
| | | |/ / /
| | * | | | Merge with 5.2Michael Widenius2010-08-091-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Added --sync-sys=0 option for mysqld to skip sync() calls for faster testingMichael Widenius2010-08-091-0/+1
| | * | | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
| | * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-0510-48/+50
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ...Michael Widenius2010-08-041-0/+2
| | | * | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-1/+1
| | | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-028-37/+48
| | | |\ \ \
| | * | \ \ \ merge with 5.1Sergei Golubchik2010-07-251-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
| | * | | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fixes for Opensolaris (to get buildbot green)Michael Widenius2010-06-231-0/+3
| | * | | | | Make MariaDB compile with VS 2010Hakan Kuecuekyilmaz2010-06-241-1/+3
| | * | | | | plugin maturity is unsignedSergei Golubchik2010-06-152-2/+2
| * | | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-162-26/+39
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-2619-192/+836
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s...Sergei Golubchik2010-06-051-0/+1
| | * | | | | merge 5.1->5.2Sergei Golubchik2010-06-016-30/+72
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-264-9/+41
| | | * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-264-18/+28
| | | |\ \ \ \
| | | * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-4/+4
| | | |\ \ \ \ \
| | * | | | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-082-1/+7
| | * | | | | | | Post review fixes.Igor Babaev2010-04-051-1/+1
| | * | | | | | | Merge with the latest changes of 5.2Igor Babaev2010-04-035-5/+79
| | |\ \ \ \ \ \ \
| | | * | | | | | | fixes for windows buildsSergei Golubchik2010-04-022-4/+7
View Lorry Controller Status