Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -176/+91 |
|\ | |||||
| * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+0 |
| |\ | |||||
| * \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+3 |
| |\ \ | |||||
| * \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings by adding casts and changing variable types | unknown | 2008-01-11 | 1 | -2/+2 |
| * | | | | | | Merge jani@marvel:/my/bk/mysql-maria.new | unknown | 2007-12-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recovery | unknown | 2007-12-17 | 1 | -1/+1 |
| * | | | | | | | Fixed after-merge problems. | unknown | 2007-12-16 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -181/+91 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added applying of undo for updates | unknown | 2007-09-09 | 1 | -1/+1 |
| | * | | | | | | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -1/+1 |
| | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -181/+91 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fixes after review of guilhem of block record patch | unknown | 2007-04-19 | 1 | -2/+0 |
| | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -178/+90 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Maria - merging recent changes done to MyISAM into Maria. | unknown | 2006-12-19 | 1 | -0/+15 |
| | | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -182/+79 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Completion of merge of mysql-5.1 into mysql-maria. | unknown | 2006-08-10 | 1 | -0/+1 |
| | | | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -179/+79 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -179/+79 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -179/+79 |
* | | | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -2/+1 |
* | | | | | | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-28 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Bug#54457: Test suite broken for 32-bit build | Davi Arnaut | 2010-06-28 | 1 | -2/+0 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmap | Vladislav Vaintroub | 2009-12-20 | 1 | -1/+1 |
* | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+4 |
* | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -4/+4 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | A follow-up to fix for | Sergey Vojtovich | 2009-10-27 | 1 | -0/+4 |
* | | | | | | | | | | | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 1 | -2/+2 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Bug#43940 64-bit windows myisamchk doesn't support key_buffer_size > 4G | Sergey Glukhov | 2009-05-27 | 1 | -1/+2 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Fix for bug #37756: enabling fulltext indexes with | Ramil Kalimullin | 2009-01-26 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | merging | Alexey Botchkov | 2008-08-23 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. | Alexey Botchkov | 2008-08-22 | 1 | -0/+4 |
* | | | | | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -18/+8 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris | unknown | 2007-08-13 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | WL#3817: Simplify string / memory area types and make things more consistent ... | unknown | 2007-05-10 | 1 | -20/+20 |
* | | | | | | | wl#3700 - post-review fixes: | unknown | 2007-03-17 | 1 | -1/+1 |
* | | | | | | | WL#3700: Handler API change: all index search methods - that is, | unknown | 2007-01-29 | 1 | -4/+3 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | unknown | 2006-12-23 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| * | | | | Many files: | unknown | 2006-12-23 | 1 | -2/+1 |
* | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug8283 | unknown | 2006-10-09 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one | unknown | 2006-10-09 | 1 | -1/+1 |
| |\ \ \ |