Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+61 |
|\ | |||||
| * | Update test results for previous csets. | Sergey Petrunya | 2011-07-08 | 1 | -4/+4 |
| * | Automatic merge | Michael Widenius | 2011-06-27 | 1 | -0/+11 |
| |\ | |||||
| | * | Added test case to show that we get a warning from CHECK TABLE if we force au... | Michael Widenius | 2011-06-13 | 1 | -0/+11 |
| * | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fixed portability problem with partiton_error.test | Michael Widenius | 2011-06-13 | 1 | -1/+1 |
| * | | Amend the previous cset: | Sergey Petrunya | 2011-04-04 | 1 | -2/+2 |
| * | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+26 |
| |\ \ | | |/ | |||||
| | * | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+26 |
| | |\ | |||||
| | | * | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 1 | -0/+26 |
| * | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -1/+17 |
| |\ \ \ | | |/ / | |||||
| | * | | 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 | 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 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -56/+53 |
|/ / / / | |||||
* | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -92/+116 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -92/+92 |
| * | | 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 |
| |/ | |||||
| * | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -0/+6 |
| * | Disable some tests that is waiting for next merge with xtradb | Michael Widenius | 2010-08-02 | 1 | -0/+7 |
* | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -6/+6 |
|/ | |||||
* | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -20/+20 |
* | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -1/+1 |
|\ | |||||
| * | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -1/+1 |
* | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
* | | Merge with old maria tree | Michael Widenius | 2009-02-01 | 1 | -0/+5 |
|\ \ | |/ |/| | |||||
| * | (Mostly) automatic merge | Michael Widenius | 2008-10-12 | 1 | -1/+22 |
| |\ | |||||
| * | | Merge with 5.1-maria | Michael Widenius | 2008-10-10 | 1 | -0/+11 |
* | | | Fixed bugs from my latest patch found by pushbuild: | Michael Widenius | 2009-01-09 | 1 | -0/+2 |
* | | | Fixed bugs found by pushbuild | Michael Widenius | 2008-12-27 | 1 | -0/+3 |
* | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test: | Michael Widenius | 2008-12-22 | 1 | -0/+7 |
* | | | Fix for BUG#40661 "Maria: crash in embedded server (when detecting deadlock?)" | Guilhem Bichot | 2008-11-27 | 1 | -13/+0 |
* | | | Small fixes for pushbuild: compiler warnings, checking that partitioning is e... | Guilhem Bichot | 2008-10-15 | 1 | -5/+0 |
* | | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA... | Michael Widenius | 2008-10-12 | 1 | -0/+292 |
| |/ |/| | |||||
* | | Merged 5.1 maria with 5.1 maria team tree. Automerge. | Michael Widenius | 2008-10-11 | 1 | -1/+22 |
|/ | |||||
* | merged | Sergei Golubchik | 2008-10-01 | 1 | -2/+0 |
* | Maria tests moved to separate suite. The suite made default for execution. | unknown | 2008-10-01 | 1 | -0/+2292 |