Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 1 | -21/+21 |
|\ | |||||
| * | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -21/+21 |
* | | Removed depricated --maria-options from mysqld. | Michael Widenius | 2011-06-09 | 3 | -60/+2 |
|/ | |||||
* | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -24/+356 |
* | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -4/+4 |
|\ | |||||
| * | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 3 | -0/+47 |
| |\ | |||||
| * | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -4/+4 |
* | | | Amend the previous cset: | Sergey Petrunya | 2011-04-04 | 1 | -2/+2 |
* | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 3 | -0/+31 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 3 | -0/+31 |
| |\ \ | |||||
| | * | | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 2 | -0/+30 |
| | * | | Fixed some mysql-test-run failures and compile warnings/errors | Michael Widenius | 2011-01-20 | 1 | -0/+1 |
* | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 2 | -2/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.1 | Michael Widenius | 2011-01-05 | 1 | -0/+16 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fixed bug in Aria that caused REPAIR to find old deleted rows. | Michael Widenius | 2010-12-21 | 1 | -0/+16 |
| * | | lpbug#665028 SHOW STORAGE ENGINES shows incorrect Transaction support for Aria | Sergei Golubchik | 2010-12-27 | 2 | -2/+2 |
* | | | Merge. | Igor Babaev | 2010-12-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Adjusted some results from the vcol, pbxt, maria test suites after | Igor Babaev | 2010-10-02 | 1 | -1/+1 |
* | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -136/+136 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -136/+136 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -136/+136 |
* | | | | | Merge to get make String reallocation faster | Michael Widenius | 2010-11-16 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Removed version number from test case | Michael Widenius | 2010-11-09 | 1 | -2/+2 |
* | | | | version of mysqld changed. | unknown | 2010-10-13 | 1 | -2/+2 |
* | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 30 | -641/+755 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | provide maria* aliases for aria* command-line options, | Sergei Golubchik | 2010-09-14 | 1 | -0/+58 |
| * | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 28 | -639/+639 |
| * | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Fixed failing test | Michael Widenius | 2010-08-25 | 1 | -2/+2 |
| * | | Merge with 5.1 | Michael Widenius | 2010-08-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed LP#605798 RQG: Table corruption after Maria engine recovery - "Wrong da... | Michael Widenius | 2010-08-11 | 1 | -1/+1 |
| * | | Merge with 5.1 to get bug fix for LP#613408 Memory corruption with (M)aria st... | Michael Widenius | 2010-08-07 | 1 | -0/+11 |
| |\ \ | | |/ | |||||
| | * | This patch fixes LP#613408 Memory corruption with (M)aria storage engine and... | Michael Widenius | 2010-08-07 | 1 | -0/+11 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -0/+6 |
| * | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 2 | -1/+8 |
| |\ \ | | |/ | |||||
| | * | Disable some tests that is waiting for next merge with xtradb | Michael Widenius | 2010-08-02 | 1 | -0/+7 |
| | * | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or... | Michael Widenius | 2010-07-30 | 1 | -1/+1 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2010-07-17 | 1 | -0/+8 |
| |\ \ | | |/ | |||||
| | * | mysql client: Ignore --comments at start of command line. This allows one to ... | Michael Widenius | 2010-07-16 | 1 | -0/+8 |
| * | | merged | Sergei Golubchik | 2010-06-16 | 2 | -2/+26 |
| |\ \ | | |/ | |||||
| | * | Fixed some bugs in the Maria storage engine | Michael Widenius | 2010-06-14 | 2 | -2/+26 |
* | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 3 | -6/+22 |
|\ \ \ | |/ / | |||||
| * | | merged | Sergei Golubchik | 2010-03-15 | 1 | -3/+2 |
| |\ \ | | |/ | |||||
| | * | Fix for LPBUG#516148 Test maria.maria3 fails when --without-maria-tmp-tables ... | Michael Widenius | 2010-02-12 | 1 | -3/+2 |
| * | | Group commit for maria engine. | unknown | 2010-02-12 | 2 | -0/+20 |
| |/ | |||||
| * | Fix test failures due to previous change of not setting TZ by default. | unknown | 2010-01-27 | 1 | -3/+0 |
* | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -6/+6 |
|/ | |||||
* | A change of direction for fix 10 csets ago: | Sergey Petrunya | 2009-09-18 | 1 | -2/+2 |