| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| * | merged | Sergei Golubchik | 2010-03-15 | 1 | -5/+10 | |
| |\ | ||||||
| | * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+10 | |
| | |\ | ||||||
| | | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+4 | |
| | | * | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-01-12 | 1 | -1/+5 | |
| | | * | Merging | unknown | 2009-12-14 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | | * | This is a patch for Bug#48500 | unknown | 2009-12-14 | 1 | -2/+2 | |
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -3/+1 | |
| * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -3/+8 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -3/+8 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | automerge | Jon Olav Hauglid | 2009-10-23 | 1 | -0/+5 | |
| | | |\ \ | ||||||
| | | | * | | Bug #47919 assert in open_table during ALTER temporary table | Jon Olav Hauglid | 2009-10-23 | 1 | -0/+5 | |
| | | * | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -3/+3 | |
| | | |/ / | ||||||
| * | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+1 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+1 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Bug#46616: Merge | Martin Hansson | 2009-08-20 | 1 | -0/+1 | |
| | | |\ \ | | | |/ | ||||||
| | | | * | Bug#46616: Assertion `!table->auto_increment_field_not_null' on | Martin Hansson | 2009-08-20 | 1 | -0/+1 | |
| * | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -6/+6 | |
| |/ / / | ||||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -15/+63 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge of the fix for bug #40113 to 5.1. | Georgi Kodinov | 2009-07-13 | 1 | -2/+9 | |
| | |\ \ | | |/ | ||||||
| | | * | Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout | Georgi Kodinov | 2009-07-13 | 1 | -2/+9 | |
| | * | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam | Alfranio Correia | 2009-06-18 | 1 | -4/+2 | |
| | |\ \ | ||||||
| | | * | | BUG#43929 binlog corruption when max_binlog_cache_size is exceeded | Alfranio Correia | 2009-06-18 | 1 | -4/+2 | |
| | | | | | ||||||
| | | \ \ | ||||||
| | *-. \ \ | 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 | |
| | | |/ | ||||||
| | | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -7/+7 | |
| | | |\ | ||||||
| | | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -1/+1 | |
| | | | |\ | ||||||
| | | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+60 | |
| | | | |\ \ | ||||||
| | | | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -1/+7 | |
| | | | |\ \ \ | ||||||
| | | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -2/+2 | |
| | | | |\ \ \ \ | ||||||
| | | | * \ \ \ \ | 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#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -1/+1 | |
| | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | BUG#37051 Replication rules not evaluated correctly | He Zhenxing | 2009-03-05 | 1 | -1/+1 | |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | * | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -3/+11 | |
| | * | | | | | | | | | Merge. | Martin Hansson | 2009-05-13 | 1 | -5/+40 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Bug#43580: Issue with Innodb on multi-table update | Martin Hansson | 2009-05-05 | 1 | -5/+40 | |
| | * | | | | | | | | | | bug#44166 | Sergei Golubchik | 2009-05-04 | 1 | -3/+3 | |
| | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -3/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Bug #39265: fix for the bug 33699 should be reverted | Gleb Shchepa | 2009-02-05 | 1 | -3/+5 | |
| | * | | | | | | | | | | 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 main 5.1 into 5.1-build | Joerg Bruehe | 2008-12-10 | 1 | -0/+31 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | 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, my... | Guilhem Bichot | 2008-12-10 | 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 | -2/+33 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |