Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 6 | -15/+15 |
|\ | |||||
| * | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 6 | -15/+15 |
* | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 36 | -214/+795 |
|\ \ | |/ | |||||
| * | Manually applied fix for innodb_bug39438 test from 5.1. | Sergey Vojtovich | 2009-11-05 | 1 | -0/+4 |
| * | Updates for test cases from innodb-zip-ss6129. | Sergey Vojtovich | 2009-11-05 | 12 | -36/+430 |
| * | Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. | Sergey Vojtovich | 2009-11-05 | 24 | -204/+367 |
| |\ | |||||
| | * | Merge of innodb-zip-ss6129 snapshot. | Sergey Vojtovich | 2009-11-03 | 23 | -205/+368 |
| | |\ | |||||
| | | * | Clean-up after applying innodb-zip-ss6129 snapshot: | Sergey Vojtovich | 2009-11-03 | 2 | -6/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+2 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -6/+60 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -14/+36 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 5 | -28/+56 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -8/+10 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -3/+10 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -2/+0 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -26/+26 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 3 | -56/+56 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 3 | -30/+41 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+6 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -6/+10 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+6 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -16/+26 |
| | | * | Applying InnoDB plugin snapshot | Sergey Vojtovich | 2009-11-03 | 1 | -1/+1 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 1 | -0/+17 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -69/+0 |
| | | * | Applying InnoDB plugin snashot | Sergey Vojtovich | 2009-11-03 | 2 | -0/+69 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 137 | -1097/+2946 |
|\ \ \ \ | |/ / / | |||||
| * | | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 18 | -525/+312 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#48177 - SELECTs with NOT IN subqueries containing NULL | Jorgen Loland | 2009-11-03 | 3 | -42/+189 |
| | * | | Manual Merge | unknown | 2009-11-03 | 4 | -0/+13 |
| | |\ \ | |||||
| | | * | | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on master | unknown | 2009-11-03 | 3 | -0/+13 |
| | * | | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe... | Davi Arnaut | 2009-11-02 | 12 | -483/+110 |
| * | | | | Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 | Alexander Nozdrin | 2009-11-05 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam. | Sergey Vojtovich | 2009-11-03 | 15 | -31/+455 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Clean-ups after applying InnoDB snapshot 5.1-ss6129: | Sergey Vojtovich | 2009-11-03 | 4 | -2/+7 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -2/+2 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 3 | -6/+8 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -0/+1 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 5 | -14/+14 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 1 | -1/+1 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 3 | -13/+56 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 3 | -1/+323 |
| | | * | | Applying InnoDB snashot 5.1-ss6129 | Sergey Vojtovich | 2009-11-02 | 3 | -1/+41 |