Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+8 | |
|\ | ||||||
| * | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null() | Sergey Vojtovich | 2009-10-28 | 1 | -1/+8 | |
* | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 | |
|\ \ | |/ | ||||||
| * | merge | Georgi Kodinov | 2009-10-16 | 1 | -2/+0 | |
| |\ | ||||||
| | * | Bug#46019: ERROR 1356 When selecting from within another | Martin Hansson | 2009-10-16 | 1 | -2/+0 | |
* | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -17/+19 | |
|\ \ \ | |/ / | ||||||
| * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -17/+19 | |
| |/ | ||||||
* | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join | Georgi Kodinov | 2009-10-07 | 1 | -0/+1 | |
* | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -1/+22 | |
|\ \ | |/ | ||||||
| * | Manual merge. | Davi Arnaut | 2009-09-30 | 1 | -23/+19 | |
| |\ | ||||||
| | * | Post-merge cleanup: Reorganize code for better comprehensibility. | Davi Arnaut | 2009-09-30 | 1 | -24/+20 | |
| * | | Manual merge. | Davi Arnaut | 2009-09-30 | 1 | -1/+26 | |
| |\ \ | | |/ | ||||||
| | * | Post-merge fix: DBUG macros are wrapped inside a loop. | Davi Arnaut | 2009-09-30 | 1 | -1/+7 | |
| | * | Bug#47525: MySQL crashed (Federated) | Davi Arnaut | 2009-09-30 | 1 | -0/+20 | |
* | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 1 | -21/+32 | |
|\ \ \ | |/ / | ||||||
| * | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -19/+30 | |
| * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+2 | |
| |\ \ | | |/ | ||||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -2/+2 | |
| * | | reverted the fix for bug #46019 from 5.1-bugteam | Georgi Kodinov | 2009-08-21 | 1 | -2/+1 | |
| |\ \ | | |/ | ||||||
| * | | merge of bug #46019 to 5.1-bugteam | Georgi Kodinov | 2009-08-20 | 1 | -1/+2 | |
| |\ \ | | |/ | ||||||
* | | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -27/+26 | |
|\ \ \ | |/ / | ||||||
| * | | Bug#43587: Putting event_scheduler=1 in init SQL file crashes | Davi Arnaut | 2009-07-24 | 1 | -1/+2 | |
| |\ \ | ||||||
| | * | | Code review for Bug#43587 Putting event_scheduler=1 in init SQL file crashes | Konstantin Osipov | 2009-07-24 | 1 | -1/+2 | |
| * | | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -25/+23 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -26/+23 | |
| | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 | |
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -24/+27 | |
|\ \ \ | |/ / | ||||||
| * | | Merge from 5.0 | Staale Smedseng | 2009-07-01 | 1 | -2/+2 | |
| |\ \ | | |/ | ||||||
| | * | Bug #45790 Potential DoS vector: Writing of user input to log | Staale Smedseng | 2009-07-01 | 1 | -2/+2 | |
| | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 1 | -2/+2 | |
| * | | Bug #45309: InnoDB does not rollback for delete and update | Alexey Kopytov | 2009-06-23 | 1 | -8/+7 | |
| | | | ||||||
| | \ | ||||||
| *-. \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -4/+4 | |
| |\ \ \ | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -14/+14 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -14/+14 | |
| | |/ | ||||||
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -24/+79 | |
| | |\ | ||||||
| | | * | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -7/+7 | |
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -23/+124 | |
| | | |\ | ||||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -49/+196 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge from mysql-5.0.66-release | Jonathan Perkin | 2008-07-17 | 1 | -0/+5 | |
| | | |\ \ \ | ||||||
| | | * | | | | Fixed packet-test bug caused by if block that didn't have curly braces. | Chad MILLER | 2008-07-15 | 1 | -0/+2 | |
| | | * | | | | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -2/+2 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -0/+60 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -26/+71 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -25/+78 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -10/+34 | |
| | * | | | | | | | | | BUG#13684: SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged if | Luis Soares | 2009-04-09 | 1 | -0/+8 | |
| | * | | | | | | | | | Auto merge | He Zhenxing | 2009-04-08 | 1 | -2/+80 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -4/+8 | |
| * | | | | | | | | | | | Merge bug#45326 | Magnus BlÄudd | 2009-06-05 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ |