Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -427/+381 |
|\ | |||||
| * | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -4/+3 |
| |\ | |||||
| | * | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -4/+3 |
| | |\ | |||||
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -4/+3 |
| * | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+1 |
| | | |\ | |||||
| | * | \ | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -1/+0 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -1/+4 |
| * | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+0 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | * | | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -0/+1 |
| | * | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -1/+1 |
| * | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+6 |
| |/ / / | |||||
| * | | | BUG#39249 Maria:query cache returns out of date results | unknown | 2009-10-06 | 1 | -1/+4 |
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -9/+9 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix for Bug #37007 Maria: different checksum for MyISAM table depending on CH... | Michael Widenius | 2008-06-28 | 1 | -0/+3 |
| * | | | | | | Added versioning of row data | unknown | 2008-04-10 | 1 | -1/+1 |
| * | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recovery | unknown | 2007-12-17 | 1 | -1/+1 |
| * | | | | | | | First part of redo/undo for key pages | unknown | 2007-11-14 | 1 | -3/+3 |
| * | | | | | | | after-merge fixes for 64bit | unknown | 2007-10-06 | 1 | -6/+6 |
| * | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -468/+406 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -3/+4 |
| | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -470/+407 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -468/+407 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Maria - merging recent changes done to MyISAM into Maria. | unknown | 2006-12-19 | 1 | -10/+2 |
| | | | * | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -462/+409 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-10-10 | 1 | -460/+411 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -460/+411 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -460/+411 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -458/+411 |
| | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -458/+413 |
* | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -5/+3 |
* | | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -4/+0 |
* | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -10/+10 |
* | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | BUG#51868 - crash with myisam_use_mmap and partitioned | Sergey Vojtovich | 2010-03-22 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj. | Sergey Vojtovich | 2009-12-09 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-11-25 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -8/+28 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Bug#41098: Query Cache returns wrong result with concurrent insert | Davi Arnaut | 2009-02-19 | 1 | -0/+1 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fix for bug #37756: enabling fulltext indexes with | Ramil Kalimullin | 2009-01-26 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | merging | Alexey Botchkov | 2008-08-23 | 1 | -1/+3 |
* | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2008-02-27 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -7/+0 |
| |/ / / / / / / / / |