summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-3/+0
|\
| * Merge bug#47867 to 5.1-bugteamMagnus Blåudd2009-11-031-3/+0
| |\
| | * Bug#47867 compiler warning _WIN32_WINNT macro redefinitionMagnus Blåudd2009-10-061-3/+0
| * | automergeKristofer Pettersson2009-11-0396-694/+2425
| |\ \
* | \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0618-93/+510
|\ \ \ \
| * | | | 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-056-83/+82
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge of innodb-zip-ss6129 snapshot.Sergey Vojtovich2009-11-035-84/+83
| | |\ \ \
| | | * | | Clean-up after applying innodb-zip-ss6129 snapshot:Sergey Vojtovich2009-11-032-6/+1
| | | * | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-26/+26
| | | * | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-032-46/+46
| | | * | | Applying InnoDB plugin snashot Sergey Vojtovich2009-11-031-6/+10
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-0676-505/+1922
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-057-346/+155
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#48177 - SELECTs with NOT IN subqueries containing NULL Jorgen Loland2009-11-032-0/+135
| | * | | | Manual Mergeunknown2009-11-033-0/+12
| | |\ \ \ \
| | | * | | | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on masterunknown2009-11-032-0/+12
| | | * | | | Automerge.Alexey Kopytov2009-10-302-0/+35
| | | |\ \ \ \
| | * | | | | | Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe...Davi Arnaut2009-11-022-346/+8
| | * | | | | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam.Sergey Vojtovich2009-11-0312-14/+415
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Clean-ups after applying InnoDB snapshot 5.1-ss6129:Sergey Vojtovich2009-11-034-2/+7
| | | * | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-022-4/+6
| | | * | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-024-12/+12
| | | * | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-022-3/+40
| | | * | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-022-0/+320
| | | * | | | | Applying InnoDB snashot 5.1-ss6129Sergey Vojtovich2009-11-022-0/+37
| * | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-054-0/+366
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeVladislav Vaintroub2009-11-03106-213/+3160
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Auto-merging mysql-5.1-bugteam-gca into mysql-5.1-bugteam latest.Luis Soares2009-11-022-0/+90
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Auto-merging bzr bundle from bug report in mysql-5.1-bugteam-gcaLuis Soares2009-11-022-0/+90
| | | | |\ \ \ \ \
| | | | | * | | | | BUG#48297: Schema name is ignored when LOAD DATA is written into Luis Soares2009-10-272-0/+90
| | | * | | | | | | Bug#47925: regression of range optimizer and date comparison in 5.1.39!Martin Hansson2009-11-022-0/+276
| | | |/ / / / / /
| * | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+36
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | auto-mergeTatiana A. Nurnberg2009-11-0234-120/+720
| | |\ \ \ \ \ \ \
| | * | | | | | | | Bug#48295: explain extended crash with subquery and ONLY_FULL_GROUP_BY sql_modeTatiana A. Nurnberg2009-10-292-0/+36
| * | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-053-0/+133
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-013-0/+133
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-243-0/+133
| * | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+87
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge fix for BUG#43171.Sergey Vojtovich2009-10-312-0/+87
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-282-0/+87
| * | | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+35
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Automerge.Alexey Kopytov2009-10-302-0/+35
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-10-302-0/+35
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Bug #48131: crash group by with rollup, distinct, filesort,Alexey Kopytov2009-10-302-0/+35
| * | | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-0518-113/+300
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | mergeGeorgi Kodinov2009-10-302-0/+29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug #48291 : crash with row() operator,select into @var, and Georgi Kodinov2009-10-302-0/+29
| | * | | | | | | | | | | mergeGeorgi Kodinov2009-10-304-100/+86
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /