summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Null-merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-300-0/+0
|\
| * Merge InnoDB snapshot with mysql-5.1-bugteam.Sergey Vojtovich2010-01-229-169/+223
| |\
| | * Applying InnoDB snapshot, fixes BUG#49396.Sergey Vojtovich2010-01-221-2/+4
| | * Disabled innodb-autoinc-44030 due to BUG#47621.Sergey Vojtovich2010-01-221-0/+1
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-221-1/+1
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-0/+64
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-55/+0
| | * Applying InnoDB snapshot, fixes BUG#46193.Sergey Vojtovich2010-01-222-103/+131
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-5/+5
| | * Applying InnoDB snapshot, fixes BUG#49238.Sergey Vojtovich2010-01-221-9/+23
* | | Auto-merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-3011-34/+526
|\ \ \
| * | | Bug #49132 Replication failure on temporary table + DDLunknown2010-01-2211-34/+526
| | |/ | |/|
* | | Make the following tests experimental:Alexander Nozdrin2010-01-281-0/+4
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-2461-340/+3459
|\ \ \ | | |/ | |/|
| * | Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-226-8/+13
| * | Post-commit fix of two testsMagne Mahre2010-01-222-3/+5
| |/
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-2115-24/+92
| * Apply patch on behalf of Magnus:Davi Arnaut2010-01-201-1/+1
| * Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
| * BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-208-8/+2170
| * post-push patch for bug#47343.Mattias Jonsson2010-01-191-0/+1
| * Bug #49512 : subquery with aggregate function crashGeorgi Kodinov2009-12-233-0/+29
| * revert of the fix for bug #45989: pushed by mistake.Georgi Kodinov2010-01-193-31/+0
| * mergeMattias Jonsson2010-01-197-28/+157
| |\
| | * Bug#47343: InnoDB fails to clean-up after lock wait timeout onMattias Jonsson2010-01-187-28/+157
| * | mergeGeorgi Kodinov2010-01-199-41/+49
| |\ \
| | * | Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-199-41/+49
| * | | Bug #45989 take 2 : memory leak after explain encounters anGeorgi Kodinov2010-01-183-0/+31
| |/ /
| * | Fix for BUG#49481 and BUG#49482 reverted.Luis Soares2010-01-194-153/+2
| * | mergeMattias Jonsson2010-01-173-26/+793
| |\ \
| | * | Bug#49742: Partition Pruning not working correctly for RANGEMattias Jonsson2009-12-223-26/+793
| * | | BUG#47418 RBR fails, failure with mixup of base/temporary/view unknown2010-01-168-18/+106
| * | | Bug #46175: NULL read_view and consistent read assertionGeorgi Kodinov2010-01-152-1/+13
| | |/ | |/|
* | | BUG#50397 rpl.rpl_heartbeat_basic fails in mysql-trunk-mergeAlfranio Correia2010-01-212-16/+11
* | | Manual merge from mysql-trunk.Alexander Nozdrin2010-01-183-17/+35
|\ \ \
| * \ \ Automerge the 5.5.1-m2 release back into the main branch.MySQL Build Team2010-01-154-25/+53
| |\ \ \
| | * | | Ensure that the variable "MYSQL_U_SCORE_VERSION" is expandedJoerg Bruehe2010-01-041-0/+1
| | * | | Backport into the 5.5.1-m2 release build:Joerg Bruehe2009-12-251-1/+0
| | * | | Remove the "fix_privilege_tables" manual from the RPM spec file,Joerg Bruehe2009-12-231-1/+3
| | * | | Backport a fix from "trunk" into 5.5.1 which came after cloning only.Joerg Bruehe2009-12-231-1/+6
| | * | | Take an essential fix from "trunk" into 5.5.1-m2Joerg Bruehe2009-12-231-0/+1
| | |\ \ \
| | * | | | The "semisync" plugin file name has lost its introductory "lib",Joerg Bruehe2009-12-231-6/+12
| | * | | | Change RPM file naming:Joerg Bruehe2009-12-223-18/+37
| * | | | | Automerge main branch with Trondheim copy.MySQL Build Team2010-01-153-2/+7
| |\ \ \ \ \
| * | | | | | Raise version number after cloning 5.5.1-m2unknown2009-12-221-1/+1
| | |/ / / / | |/| | | |
* | | | | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-1563-165/+1053
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | mergeGeorgi Kodinov2010-01-1510-34/+390
| |\ \ \ \ \
| | * | | | | Fix for BUG#49481 and BUG#49482.Luis Soares2010-01-144-2/+153
| | * | | | | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-141-1/+1
| | * | | | | BUG#50018: automerge from 5.1-bt local --> 5.1-bt local latest.Luis Soares2010-01-143-21/+212
| | |\ \ \ \ \