summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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
* | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-6/+9
* | 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 mysql-5.1-bugteam to mysql-5.1-securityJimmy Yang2010-09-0119-136/+364
| | |\
| | | * Increment InnoDB Plugin version to 1.0.12.Vasil Dimov2010-08-261-1/+1
| | | * Bug#55832: selects crash too easily when innodb_force_recovery>3Marko Mäkelä2010-08-243-40/+59
| | | * Bug#55832: selects crash too easily when innodb_force_recovery>3Marko Mäkelä2010-08-232-38/+55
| | | * Fix Bug #54538 - use of exclusive innodb dictionary lock limits performance.Sunny Bains2010-08-205-33/+160
| | | * Fix Bug #55027: assertion: mutex_own(&dict_sys->mutex) in dict_table_get_on_id()Sunny Bains2010-08-202-4/+2
| | | * Fix bug#55699 - Assertion failure in innodb plugin with large number of threadsSunny Bains2010-08-201-1/+2
| | | * Bug#55626: MIN and MAX reading a delete-marked record from secondary indexMarko Mäkelä2010-08-181-3/+12
| | | * Address bug #55465 ERROR 1280 (42000): Incorrect index name '<index name>',Jimmy Yang2010-08-063-4/+32
| | | * Backport of revno 3148 mysql-innodb-trunkInaam Rana2010-08-054-0/+10
| | | * Backport "NULL pointer check for ut_free()" from mysql-trunk-innodb toJimmy Yang2010-08-033-4/+13
| | | * Fix Bug #55382 Assignment with SELECT expressions takes unexpected S locksJimmy Yang2010-08-013-8/+17
| | * | This is to resolve a hang situation in 5.1 builtin raised byJimmy Yang2010-08-243-0/+71
| | * | Fix Bug #55277 - Failing assertion: auto_inc > 0Sunny Bains2010-08-052-12/+26
| | * | Fix bug# 55543 - InnoDB Plugin: Signal 6: Assertion failure in file fil/fil0f...Sunny Bains2010-08-053-10/+19
| | * | Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlockJimmy Yang2010-08-044-0/+77
| | * | Fix Bug #54582 stack overflow when opening many tables linked withJimmy Yang2010-08-0416-21/+278
| | |/
* | | 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
* | | 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