Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minus | 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.clone-5.0.81-build | Chad MILLER | 2009-04-14 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | * \ | Merged from 5.0 (enterprise).mysql-5.0.75clone-5.0.75-build | 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.1mariadb-merge-mysql-5.1.34plus | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -51/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
* | | | | | | | | | | | | | | | | Bug #40745: Error during WHERE clause calculation in UPDATE | Gleb Shchepa | 2008-11-28 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-11-27 | 1 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Bug#37460 Assertion failed: !table->file || table->file->inited == handler::NONE | Sergey Glukhov | 2008-11-27 | 1 | -0/+26 | |
* | | | | | | | | | | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcclone-5.1.29-build | Gleb Shchepa | 2008-10-09 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Bug#38499: flush tables and multitable table update with | Gleb Shchepa | 2008-10-09 | 1 | -0/+20 | |
* | | | | | | | | | | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc | Gleb Shchepa | 2008-10-08 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Bug #38691: segfault/abort in ``UPDATE ...JOIN'' while | Gleb Shchepa | 2008-10-08 | 1 | -1/+12 | |
* | | | | | | | | | | | | | | | Bug#34306: Can't make copy of log tables when server binary log is enabled | Davi Arnaut | 2008-09-29 | 1 | -1/+1 | |
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Cherry picking patch for BUG#37051 | He Zhenxing | 2008-08-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge fix for BUG#35478 into 5.1 | Sergey Petrunia | 2008-07-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | BUG#35478: sort_union() returns bad data when sort_buffer_size is hit | Sergey Petrunia | 2008-07-15 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |