summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-25783-1256/+431216
|\
| * Fix buildbot failure introduced by the previous pushSergey Petrunya2010-11-091-1/+0
| * Fix buildbot failures caused by two previous pushes.Sergey Petrunya2010-11-081-4/+3
| * Fix buildbot errors: rec_per_key_part can be 0 if re-openingSergey Petrunya2010-11-081-1/+1
| * [Patch from Monty] Fix stack-overrun crash in subselect_notembedded.testSergey Petrunya2010-11-081-6/+22
| * Automerge with 5.2Michael Widenius2010-11-0526-113/+328
| |\
| | * Automatic merge with MariaDB 5.1Michael Widenius2010-11-047-45/+98
| | |\
| | | * Automatic mergeMichael Widenius2010-11-042-35/+43
| | | |\
| | | | * When scanning pages, stop when you are at 'data_file_length'.Michael Widenius2010-11-042-35/+43
| | | * | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-035-10/+55
| | | |/
| | * | Automatic merge with 5.1Michael Widenius2010-11-0421-68/+230
| | |\ \ | | | |/
| | | * Automatic mergeMichael Widenius2010-11-035-10/+85
| | | |\
| | | | * Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-035-10/+85
| | | * | #endif fixed.unknown2010-11-022-4/+2
| | | |/
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-0218-55/+144
| * | | MergeIgor Babaev2010-11-021-6/+9
| |\ \ \
| | * \ \ mergeSergei Golubchik2010-11-021-6/+9
| | |\ \ \
| | | * \ \ merge w/ 5.2Sergei Golubchik2010-11-021-6/+9
| | | |\ \ \ | | | | |/ /
| | | | * | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-6/+9
| * | | | | Fixed LP bug #669420.Igor Babaev2010-11-021-0/+1
| |/ / / /
| * | | | Fixed bug #665049.Igor Babaev2010-10-291-1/+1
| |/ / /
| * | | 5.2 mergeSergei Golubchik2010-10-2884-477/+1893
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-10-2584-472/+1888
| | |\ \ | | | |/
| | | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1935-278/+785
| | | |\
| | | | * Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.unknown2010-10-1946-294/+1054
| | | * | 5.1.51 mergeSergei Golubchik2010-10-1961-265/+1174
| | | |\ \ | | | | |/ | | | |/|
| * | | | Merge from mariadb-5.1 (through mariadb-5.2)Igor Babaev2010-10-1410-93/+177
| |\ \ \ \ | | |/ / /
| | * | | MergeIgor Babaev2010-10-1410-93/+177
| | |\ \ \ | | | |/ /
| | | * | Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ...Michael Widenius2010-10-136-44/+56
| | | * | Use less memory on stack in sql_parse.cc and in repair/check for MyISAM & AriaMichael Widenius2010-10-123-26/+59
| | | * | Fixes some bug in Aria recovery:Michael Widenius2010-10-077-25/+63
| * | | | Merge 5.2->5.3Sergey Petrunya2010-10-10350-5389/+19752
| |\ \ \ \ | | |/ / /
| | * | | Automatic merge with 5.1Michael Widenius2010-10-0620-84/+636
| | |\ \ \ | | | |/ /
| | | * | Merge with 1.0.11-7 Pre-GA - 2010-09-09Michael Widenius2010-09-2820-83/+663
| | * | | Automatic mergeMichael Widenius2010-10-011-2/+1
| | |\ \ \
| | | * | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-2/+1
| | * | | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data...Michael Widenius2010-09-282-7/+2
| | * | | | Rename control file and log files from maria_xxx to aria_xxx when upgrading f...Michael Widenius2010-09-272-3/+77
| | * | | | merge with 5.1Sergei Golubchik2010-09-168-37/+120
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | mergedSergei Golubchik2010-09-1310-25/+18
| | | |\ \ \
| | | * | | | Fixed Aria recovery bug:Michael Widenius2010-09-131-5/+63
| | | * | | | Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in bitma...Michael Widenius2010-09-108-32/+57
| | * | | | | fixes for make dist, 32-bit OS, and other buildbot failuresSergei Golubchik2010-09-162-97/+97
| | * | | | | oqgraph and sphinx on windowsSergei Golubchik2010-09-156-21/+40
| | * | | | | MYSQL_PLUGIN_WITHOUT() macro for plug.inSergei Golubchik2010-09-141-1/+1
| | * | | | | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-146-49/+310
| | * | | | | rename maria to ariaSergei Golubchik2010-09-1225-330/+332
| | * | | | | build federared* with libmysqlservicesSergei Golubchik2010-09-122-2/+4
| | * | | | | fix incorrect xtradb plugin metadata.Sergei Golubchik2010-09-111-2/+2
| | * | | | | merge with 5.1Sergei Golubchik2010-09-11152-1702/+4103
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |