summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge various replication-related patches into MariaDB 5.3:unknown2011-04-082-5/+10
|\
| * Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-018-1/+106
| |\
| * | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-102-5/+10
* | | Amend the previous cset:Sergey Petrunya2011-04-041-2/+2
* | | Merge with 5.2Michael Widenius2011-03-097-1/+71
|\ \ \ | | |/ | |/|
| * | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-287-1/+71
| |\ \
| | * | Fixes for Aria storage engine:Michael Widenius2011-02-104-1/+64
| | * | Fixed bugs found by buildbot:Michael Widenius2011-01-261-0/+2
| | * | Fixed some mysql-test-run failures and compile warnings/errorsMichael Widenius2011-01-203-0/+5
* | | | Merge with 5.1Michael Widenius2011-01-114-2/+37
|\ \ \ \ | |/ / /
| * | | Merge with 5.1Michael Widenius2011-01-053-0/+35
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Speed up `mtr --parallel=<lots>` by scheduling some slow tests earlier.unknown2011-01-031-0/+1
| | * Fixed bug in Aria that caused REPAIR to find old deleted rows.Michael Widenius2010-12-212-0/+34
| * | lpbug#665028 SHOW STORAGE ENGINES shows incorrect Transaction support for AriaSergei Golubchik2010-12-272-2/+2
* | | Merge.Igor Babaev2010-12-101-1/+1
|\ \ \
| * \ \ Merge 5.3-mwl128 -> 5.3Igor Babaev2010-10-271-1/+1
| |\ \ \
| | * | | Adjusted some results from the vcol, pbxt, maria test suites afterIgor Babaev2010-10-021-1/+1
* | | | | Merge with 5.1-release.Michael Widenius2010-12-061-136/+136
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge with 5.1Michael Widenius2010-11-301-136/+136
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-136/+136
* | | | | Merge to get make String reallocation fasterMichael Widenius2010-11-162-2/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Removed version number from test caseMichael Widenius2010-11-092-2/+3
* | | | version of mysqld changed.unknown2010-10-131-2/+2
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-1066-1303/+1704
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | fixes for make dist, 32-bit OS, and other buildbot failuresSergei Golubchik2010-09-161-0/+1
| * | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-144-0/+124
| * | rename maria to ariaSergei Golubchik2010-09-1261-1303/+1303
| * | Automerge with 5.1Michael Widenius2010-08-251-2/+2
| |\ \ | | |/
| | * Fixed failing testMichael Widenius2010-08-251-2/+2
| * | Merge with 5.1Michael Widenius2010-08-111-1/+1
| |\ \ | | |/
| | * Fixed LP#605798 RQG: Table corruption after Maria engine recovery - "Wrong da...Michael Widenius2010-08-111-1/+1
| * | Merge with 5.1 to get bug fix for LP#613408 Memory corruption with (M)aria st...Michael Widenius2010-08-072-0/+28
| |\ \ | | |/
| | * This patch fixes LP#613408 Memory corruption with (M)aria storage engine and...Michael Widenius2010-08-072-0/+28
| * | Merge with MariaDB 5.1Michael Widenius2010-08-062-0/+21
| |\ \ | | |/
| | * Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-062-0/+21
| * | Merge with MariaDB 5.1.49Michael Widenius2010-08-053-1/+16
| |\ \ | | |/
| | * Disable some tests that is waiting for next merge with xtradbMichael Widenius2010-08-022-0/+15
| | * Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or...Michael Widenius2010-07-301-1/+1
| * | Merge with MariaDB 5.1Michael Widenius2010-07-172-0/+170
| |\ \ | | |/
| | * mysql client: Ignore --comments at start of command line. This allows one to ...Michael Widenius2010-07-162-0/+170
| * | mergedSergei Golubchik2010-06-163-2/+44
| |\ \ | | |/
| | * Fixed some bugs in the Maria storage engineMichael Widenius2010-06-143-2/+44
* | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-262-0/+6
|\ \ \ | |/ /
| * | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+5
| |\ \ | | |/
| | * Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+5
| * | only run maria tests if maria is compiled inSergei Golubchik2010-05-271-0/+1
* | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-208-13/+102
|\ \ \ | |/ /
| * | mergedSergei Golubchik2010-03-152-4/+3
| |\ \ | | |/
| | * Fix for LPBUG#516148 Test maria.maria3 fails when --without-maria-tmp-tables ...Michael Widenius2010-02-122-4/+3
| * | Group commit for maria engine.unknown2010-02-123-0/+91
| |/