summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-066-15/+15
|\
| * Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-056-15/+15
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0636-214/+795
|\ \ | |/
| * Manually applied fix for innodb_bug39438 test from 5.1.Sergey Vojtovich2009-11-051-0/+4
| * Updates for test cases from innodb-zip-ss6129.Sergey Vojtovich2009-11-0512-36/+430
| * Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk.Sergey Vojtovich2009-11-0524-204/+367
| |\
| | * Merge of innodb-zip-ss6129 snapshot.Sergey Vojtovich2009-11-0323-205/+368
| | |\
| | | * Clean-up after applying innodb-zip-ss6129 snapshot:Sergey Vojtovich2009-11-032-6/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+2
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-6/+60
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-14/+36
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-035-28/+56
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-8/+10
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-3/+10
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-2/+0
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-26/+26
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-033-56/+56
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-033-30/+41
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+6
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-6/+10
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+6
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-1/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-16/+26
| | | * Applying InnoDB plugin snapshot Sergey Vojtovich2009-11-031-1/+1
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-0/+17
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-69/+0
| | | * Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-0/+69
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-06137-1097/+2946
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-0518-525/+312
| |\ \ \ | | |/ /
| | * | Bug#48177 - SELECTs with NOT IN subqueries containing NULL Jorgen Loland2009-11-033-42/+189
| | * | Manual Mergeunknown2009-11-034-0/+13
| | |\ \
| | | * | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on masterunknown2009-11-033-0/+13
| | * | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe...Davi Arnaut2009-11-0212-483/+110
| * | | | Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1Alexander Nozdrin2009-11-050-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam.Sergey Vojtovich2009-11-0315-31/+455
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Clean-ups after applying InnoDB snapshot 5.1-ss6129:Sergey Vojtovich2009-11-034-2/+7
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-2/+2
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-023-6/+8
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-0/+1
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-025-14/+14
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-021-1/+1
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-023-13/+56
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-023-1/+323
| | | * | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-023-1/+41