summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/r/maria.result
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-8/+61
|\
| * Update test results for previous csets.Sergey Petrunya2011-07-081-4/+4
| * Automatic mergeMichael Widenius2011-06-271-0/+11
| |\
| | * Added test case to show that we get a warning from CHECK TABLE if we force au...Michael Widenius2011-06-131-0/+11
| * | Merge 5.2 -> 5.3 Sergey Petrunya2011-06-241-1/+1
| |\ \ | | |/ | |/|
| | * Fixed portability problem with partiton_error.testMichael Widenius2011-06-131-1/+1
| * | Amend the previous cset:Sergey Petrunya2011-04-041-2/+2
| * | Merge with 5.2Michael Widenius2011-03-091-0/+26
| |\ \ | | |/
| | * Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+26
| | |\
| | | * Fixes for Aria storage engine:Michael Widenius2011-02-101-0/+26
| * | | Merge with 5.1Michael Widenius2011-01-111-1/+17
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2011-01-051-0/+16
| | |\ \ | | | |/
| | | * Fixed bug in Aria that caused REPAIR to find old deleted rows.Michael Widenius2010-12-211-0/+16
| | * | lpbug#665028 SHOW STORAGE ENGINES shows incorrect Transaction support for AriaSergei Golubchik2010-12-271-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
* | | | | lots of post-merge changesSergei Golubchik2011-04-251-56/+53
|/ / / /
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-92/+116
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | rename maria to ariaSergei Golubchik2010-09-121-92/+92
| * | 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-071-0/+11
| |\ \ | | |/
| | * This patch fixes LP#613408 Memory corruption with (M)aria storage engine and...Michael Widenius2010-08-071-0/+11
| |/
| * Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar...Michael Widenius2010-08-061-0/+6
| * Disable some tests that is waiting for next merge with xtradbMichael Widenius2010-08-021-0/+7
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-6/+6
|/
* Added some changes inspired by Zardosht Kasheff:Michael Widenius2009-06-301-20/+20
* Merge with mysql-maria treeMichael Widenius2009-02-191-1/+1
|\
| * merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-1/+1
* | Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
* | Merge with old maria treeMichael Widenius2009-02-011-0/+5
|\ \ | |/ |/|
| * (Mostly) automatic mergeMichael Widenius2008-10-121-1/+22
| |\
| * | Merge with 5.1-mariaMichael Widenius2008-10-101-0/+11
* | | Fixed bugs from my latest patch found by pushbuild:Michael Widenius2009-01-091-0/+2
* | | Fixed bugs found by pushbuildMichael Widenius2008-12-271-0/+3
* | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test:Michael Widenius2008-12-221-0/+7
* | | Fix for BUG#40661 "Maria: crash in embedded server (when detecting deadlock?)"Guilhem Bichot2008-11-271-13/+0
* | | Small fixes for pushbuild: compiler warnings, checking that partitioning is e...Guilhem Bichot2008-10-151-5/+0
* | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-0/+292
| |/ |/|
* | Merged 5.1 maria with 5.1 maria team tree. Automerge.Michael Widenius2008-10-111-1/+22
|/
* mergedSergei Golubchik2008-10-011-2/+0
* Maria tests moved to separate suite. The suite made default for execution.unknown2008-10-011-0/+2292