Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
|\ | ||||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| |\ | ||||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| * | | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -1/+2 | |
* | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -1/+1 | |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -6/+8 | |
|\ \ \ | |/ / | ||||||
| * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -5/+5 | |
| * | | Bug #53450: Crash / assertion "virtual int | Gleb Shchepa | 2010-05-14 | 1 | -1/+1 | |
| * | | Bug #49756 Rows_examined is always 0 in the slow query log for | Staale Smedseng | 2010-05-12 | 1 | -0/+2 | |
* | | | 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 | |
|\ \ \ | |/ / | ||||||
| * | | BUG#51251: Wrong binlogging in case of TRUNCATE <temporary InnoDB table> | Luis Soares | 2010-02-26 | 1 | -1/+3 | |
| * | | BUG#51251: Wrong binlogging in case of TRUNCATE <temporary InnoDB table> | Luis Soares | 2010-02-24 | 1 | -4/+12 | |
* | | | 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 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 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 | |
|\ \ \ | |/ / | ||||||
| * | | Bug #48350 truncate temporary table crashes replication | unknown | 2009-11-22 | 1 | -5/+5 | |
| * | | Bug #46425 crash in Diagnostics_area::set_ok_status , empty statement, | Magne Mahre | 2009-11-18 | 1 | -1/+2 | |
* | | | 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 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -4/+4 | |
| | * | | Bug#46958: Assertion in Diagnostics_area::set_ok_status, | Martin Hansson | 2009-09-28 | 1 | -61/+87 | |
* | | | | 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 | |
|\ \ \ | |/ / | ||||||
| * | | Fix for bug #46456 [Ver->Prg]: HANDLER OPEN + TRUNCATE + DROP | Ramil Kalimullin | 2009-08-21 | 1 | -0/+4 | |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -18/+74 | |
|\ \ \ | |/ / | ||||||
| * | | Merge of the fix for bug #40113 to 5.1. | Georgi Kodinov | 2009-07-13 | 1 | -1/+9 | |
| |\ \ | | |/ | ||||||
| | * | Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout | Georgi Kodinov | 2009-07-13 | 1 | -1/+9 | |
| * | | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -2/+2 | |
| * | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-06-18 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | BUG#43929 binlog corruption when max_binlog_cache_size is exceeded | Alfranio Correia | 2009-06-18 | 1 | -1/+1 | |
| | | | | ||||||
| | \ \ | ||||||
| *-. \ \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -1/+1 | |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -1/+1 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | merged 5.0-main -> 5.0-bugteam | Georgi Kodinov | 2009-05-15 | 1 | -7/+7 | |
| | |\ | ||||||
| | | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -7/+7 | |
| | | |\ | ||||||
| | | | * | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -2/+2 | |
| | | | |\ | ||||||
| | | | * \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -2/+2 | |
| | | | |\ \ | ||||||
| | | | * \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -9/+10 | |
| | | | |\ \ \ | ||||||
| | | | * \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -7/+7 | |
| | | | |\ \ \ \ | ||||||
| | | | | * \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -7/+7 | |
| | | | | |\ \ \ \ | ||||||
| | | | | | * \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -7/+7 | |
| | | | | | |\ \ \ \ | ||||||
| | | | | | | * \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -7/+7 | |
| | | | | | | |\ \ \ \ | ||||||
| * | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -3/+11 | |
| * | | | | | | | | | | | merging with local fix. | Anurag Shekhar | 2009-05-06 | 1 | -1/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Bug #39918 memory (heap) engine crashing with b-tree index and DELETE | Anurag Shekhar | 2009-05-06 | 1 | -1/+19 | |
| | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -2/+2 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | |