| Commit message (Expand) | Author | Age | Files | Lines |
* | Automatic merge with MariaDB 5.1 | Michael Widenius | 2010-11-04 | 7 | -45/+98 |
|\ |
|
| * | Automatic merge | Michael Widenius | 2010-11-04 | 2 | -35/+43 |
| |\ |
|
| | * | When scanning pages, stop when you are at 'data_file_length'. | Michael Widenius | 2010-11-04 | 2 | -35/+43 |
| * | | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread | unknown | 2010-11-03 | 5 | -10/+55 |
| |/ |
|
* | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 21 | -68/+230 |
|\ \
| |/ |
|
| * | Automatic merge | Michael Widenius | 2010-11-03 | 5 | -10/+85 |
| |\ |
|
| | * | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 5 | -10/+85 |
| * | | #endif fixed. | unknown | 2010-11-02 | 2 | -4/+2 |
| |/ |
|
| * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 18 | -55/+144 |
* | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 1 | -6/+9 |
* | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 84 | -472/+1888 |
|\ \
| |/ |
|
| * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 35 | -278/+785 |
| |\ |
|
| | * | Merge XtraDB from Percona-server-5.1.51-12 into MariaDB. | unknown | 2010-10-19 | 46 | -294/+1054 |
| * | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 61 | -265/+1174 |
| |\ \
| | |/
| |/| |
|
| | * | Merge from mysql-5.1-bugteam to mysql-5.1-security | Jimmy Yang | 2010-09-01 | 19 | -136/+364 |
| | |\ |
|
| | | * | Increment InnoDB Plugin version to 1.0.12. | Vasil Dimov | 2010-08-26 | 1 | -1/+1 |
| | | * | Bug#55832: selects crash too easily when innodb_force_recovery>3 | Marko Mäkelä | 2010-08-24 | 3 | -40/+59 |
| | | * | Bug#55832: selects crash too easily when innodb_force_recovery>3 | Marko Mäkelä | 2010-08-23 | 2 | -38/+55 |
| | | * | Fix Bug #54538 - use of exclusive innodb dictionary lock limits performance. | Sunny Bains | 2010-08-20 | 5 | -33/+160 |
| | | * | Fix Bug #55027: assertion: mutex_own(&dict_sys->mutex) in dict_table_get_on_id() | Sunny Bains | 2010-08-20 | 2 | -4/+2 |
| | | * | Fix bug#55699 - Assertion failure in innodb plugin with large number of threads | Sunny Bains | 2010-08-20 | 1 | -1/+2 |
| | | * | Bug#55626: MIN and MAX reading a delete-marked record from secondary index | Marko Mäkelä | 2010-08-18 | 1 | -3/+12 |
| | | * | Address bug #55465 ERROR 1280 (42000): Incorrect index name '<index name>', | Jimmy Yang | 2010-08-06 | 3 | -4/+32 |
| | | * | Backport of revno 3148 mysql-innodb-trunk | Inaam Rana | 2010-08-05 | 4 | -0/+10 |
| | | * | Backport "NULL pointer check for ut_free()" from mysql-trunk-innodb to | Jimmy Yang | 2010-08-03 | 3 | -4/+13 |
| | | * | Fix Bug #55382 Assignment with SELECT expressions takes unexpected S locks | Jimmy Yang | 2010-08-01 | 3 | -8/+17 |
| | * | | This is to resolve a hang situation in 5.1 builtin raised by | Jimmy Yang | 2010-08-24 | 3 | -0/+71 |
| | * | | Fix Bug #55277 - Failing assertion: auto_inc > 0 | Sunny Bains | 2010-08-05 | 2 | -12/+26 |
| | * | | Fix bug# 55543 - InnoDB Plugin: Signal 6: Assertion failure in file fil/fil0f... | Sunny Bains | 2010-08-05 | 3 | -10/+19 |
| | * | | Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock | Jimmy Yang | 2010-08-04 | 4 | -0/+77 |
| | * | | Fix Bug #54582 stack overflow when opening many tables linked with | Jimmy Yang | 2010-08-04 | 16 | -21/+278 |
| | |/ |
|
* | | | Merge | Igor Babaev | 2010-10-14 | 10 | -93/+177 |
|\ \ \
| |/ / |
|
| * | | Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ... | Michael Widenius | 2010-10-13 | 6 | -44/+56 |
| * | | Use less memory on stack in sql_parse.cc and in repair/check for MyISAM & Aria | Michael Widenius | 2010-10-12 | 3 | -26/+59 |
| * | | Fixes some bug in Aria recovery: | Michael Widenius | 2010-10-07 | 7 | -25/+63 |
* | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 20 | -84/+636 |
|\ \ \
| |/ / |
|
| * | | Merge with 1.0.11-7 Pre-GA - 2010-09-09 | Michael Widenius | 2010-09-28 | 20 | -83/+663 |
* | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -2/+1 |
|\ \ \ |
|
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -2/+1 |
* | | | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data... | Michael Widenius | 2010-09-28 | 2 | -7/+2 |
* | | | | Rename control file and log files from maria_xxx to aria_xxx when upgrading f... | Michael Widenius | 2010-09-27 | 2 | -3/+77 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 8 | -37/+120 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | merged | Sergei Golubchik | 2010-09-13 | 10 | -25/+18 |
| |\ \ \ |
|
| * | | | | Fixed Aria recovery bug: | Michael Widenius | 2010-09-13 | 1 | -5/+63 |
| * | | | | Fix for LP#634943 "marked as crashed", "zerofilling" and "wrong data in bitma... | Michael Widenius | 2010-09-10 | 8 | -32/+57 |
* | | | | | fixes for make dist, 32-bit OS, and other buildbot failures | Sergei Golubchik | 2010-09-16 | 2 | -97/+97 |
* | | | | | oqgraph and sphinx on windows | Sergei Golubchik | 2010-09-15 | 6 | -21/+40 |
* | | | | | MYSQL_PLUGIN_WITHOUT() macro for plug.in | Sergei Golubchik | 2010-09-14 | 1 | -1/+1 |
* | | | | | provide maria* aliases for aria* command-line options, | Sergei Golubchik | 2010-09-14 | 6 | -49/+310 |
* | | | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 25 | -330/+332 |