| Commit message (Expand) | Author | Age | Files | Lines |
* | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
|\ |
|
| * | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+10 |
|\ \ |
|
| * \ | Manual merge. | Ramil Kalimullin | 2009-03-25 | 1 | -0/+1 |
| |\ \ |
|
| | * \ | Auto-merge | Ramil Kalimullin | 2009-03-25 | 1 | -0/+7 |
| | |\ \ |
|
| | * | | | Fix for bug#35383: binlog playback and replication breaks | Ramil Kalimullin | 2009-03-25 | 1 | -0/+1 |
| * | | | | Bug#43748: crash when non-super user tries to kill the replication threads | Tatiana A. Nurnberg | 2009-03-25 | 1 | -0/+8 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Bug#43748: crash when non-super user tries to kill the replication threads | Tatiana A. Nurnberg | 2009-03-25 | 1 | -0/+7 |
| | |/ / |
|
| * | | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-03-24 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Bug#43461: invalid comparison with string literal in default.c | Davi Arnaut | 2009-03-19 | 1 | -1/+1 |
| | * | | Manual merge | Kristofer Pettersson | 2009-03-06 | 1 | -1/+14 |
| | |\ \ |
|
| | | * | | BUG#37051 Replication rules not evaluated correctly | He Zhenxing | 2009-03-05 | 1 | -1/+5 |
| | * | | | Bug#40363 Bug 20023 is not fixed on 5.0 | Kristofer Pettersson | 2009-03-05 | 1 | -0/+6 |
* | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -6/+11 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+8 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 ! | Guangbao Ni | 2009-03-05 | 1 | -1/+3 |
| | * | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-13 | 1 | -0/+5 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Fix for bug #41868: crash or memory overrun with concat + upper, | Alexey Kopytov | 2009-02-10 | 1 | -0/+5 |
| * | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -5/+3 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Bug#42634: % character in query can cause mysqld signal 11 segfault | Davi Arnaut | 2009-02-09 | 1 | -5/+3 |
| | * | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-06 | 1 | -5/+0 |
| | |\ \ \ |
|
| | | * | | | Temporarily reverted patch for bug #41868 as it was causing problems in PB. | Alexey Kopytov | 2009-02-06 | 1 | -5/+0 |
| | * | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-05 | 1 | -0/+5 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Fix for bug #41868: crash or memory overrun with concat + upper, date_format | Alexey Kopytov | 2009-02-03 | 1 | -0/+5 |
| | | |/ / |
|
| | | * | | Backport patch for Bug#31222 (com_% global status counters behave randomly | Alexander Nozdrin | 2009-01-15 | 1 | -0/+4 |
| | | |/ |
|
* | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -0/+2 |
|/ / / |
|
* | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -1/+0 |
|\ \ \
| |/ / |
|
| * | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-08 | 1 | -1/+1 |
| |\ \ |
|
| | * \ | Merge main 5.1 into 5.1-build | Joerg Bruehe | 2008-12-10 | 1 | -2/+12 |
| | |\ \ |
|
| | * \ \ | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| * | | | | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -2/+12 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r... | Andrei Elkin | 2008-11-12 | 1 | -13/+31 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| * | | | | | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -7/+18 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merging 5.1 main into 5.1-rpl. | Mats Kindahl | 2008-10-06 | 1 | -0/+15 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Fixning compiler warnings. Fixing build failure for valgrind platform. | Mats Kindahl | 2008-08-22 | 1 | -4/+6 |
| * | | | | | | | | Bug #34707: Row based replication: slave creates table within wrong database | Mats Kindahl | 2008-08-19 | 1 | -1/+23 |
| * | | | | | | | | post push fix for BUG#37051 | He Zhenxing | 2008-08-07 | 1 | -0/+1 |
| * | | | | | | | | Auto merge | He Zhenxing | 2008-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | BUG#37051 Replication rules not evaluated correctly | He Zhenxing | 2008-07-31 | 1 | -0/+2 |
* | | | | | | | | | | post-review fixes | Sergei Golubchik | 2009-01-15 | 1 | -1/+3 |
* | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -86/+72 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ / /
|/| | | | | | | | | |
|
| * | | | | | | | | | Fixed warnings and errors discovered by pushbuild2 | Michael Widenius | 2008-12-04 | 1 | -1/+1 |
| * | | | | | | | | | Merge with base MySQL-5.1-maria | Michael Widenius | 2008-12-03 | 1 | -17/+71 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -17/+71 |
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / /
| | | |/| | | | | | | |
|
| * | | | | | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -3/+43 |
| |/ / / / / / / / / |
|
| * | | | | | | | | | Backport of fix made in 6.0-maria in revision guilhem@mysql.com-2008102020241... | Guilhem Bichot | 2008-10-24 | 1 | -2/+3 |
| * | | | | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -6/+45 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / /
| | |/| | | | | | | |
|
| * | | | | | | | | | wt: comments, OOM checks, test case for deadlock detection | Sergei Golubchik | 2008-08-28 | 1 | -0/+4 |