Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+1 |
|\ | |||||
| * | Bug #51099 Assertion in mysql_multi_delete_prepare() | Jon Olav Hauglid | 2010-10-04 | 1 | -3/+1 |
* | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+0 |
* | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -8/+20 |
|\ \ | |/ |/| | |||||
| * | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -1/+0 |
| * | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -6/+8 |
| |\ | |||||
| | * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -6/+8 |
| | |\ | |||||
| * | \ | Merge | Igor Babaev | 2010-07-17 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -1/+1 |
| * | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -2/+12 |
| |/ / / | |||||
| * | | | Fixed bug #601164. | Igor Babaev | 2010-07-02 | 1 | -0/+1 |
| |/ / | |||||
| * | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -2/+1 |
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -4/+14 |
| |\ \ | |||||
| * \ \ | Automatic merge | Michael Widenius | 2010-03-10 | 1 | -2/+5 |
| |\ \ \ | |||||
| | * | | | Fix for: Bug#44987 DELETE IGNORE and FK constraint | Michael Widenius | 2010-03-10 | 1 | -2/+5 |
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -0/+4 |
| * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -65/+91 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -65/+91 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | Safety change to ensure read/black trees (used with heap tables) works on 64 ... | Michael Widenius | 2009-11-16 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -18/+74 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -2/+20 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -2/+20 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -22/+24 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -22/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -36/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -6/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -6/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | First part of redo/undo for key pages | unknown | 2007-11-14 | 1 | -16/+13 |
| | | * | | | | | | | | | | | | | | | make maria more pluggable | unknown | 2007-10-12 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -1/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | * tests which use MERGE or INSERT DELAYED should run only | unknown | 2007-08-09 | 1 | -5/+5 |
| | | | * | | | | | | | | | | | | | | | Hackish fix for at-shutdown assertions in | unknown | 2007-08-08 | 1 | -1/+12 |
* | | | | | | | | | | | | | | | | | | | Rename select_send::abort() to select_send::abort_result_set() | Alexander Nozdrin | 2010-07-28 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | manual merge from mysql-5.1-bugteam | Jon Olav Hauglid | 2010-07-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Bug #30584: delete with order by and limit clauses does not | Gleb Shchepa | 2010-06-23 | 1 | -11/+18 |
* | | | | | | | | | | | | | | | | | | | Merge trunk-bugfixing -> trunk-runtime | Konstantin Osipov | 2010-06-17 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | | | | | | manual merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-06-06 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Backport: Remove unused and ancient files, functions, and facilities. | Davi Arnaut | 2010-05-28 | 1 | -2/+1 |
| * | | | | | | | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-24 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / |