summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-1978-237/+1486
|\
| * 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
| | | |\ \ \ \
| | | | * | | | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-072-561/+150
| | | | * | | | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-065-358/+960
| | | * | | | | automergeKristofer Pettersson2010-01-1356-127/+600
| | | |\ \ \ \ \
| | | * | | | | | Bug#33982 debug assertion and crash reloading grant tables after sighup or killKristofer Pettersson2010-01-133-10/+24
| | | | |/ / / / | | | |/| | | |
| | * | | | | | merge of version change.Georgi Kodinov2010-01-152-1/+4
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | version changeGeorgi Kodinov2010-01-141-1/+1
| | * | | | | | Merge of fix for Bug#48157.Martin Hansson2010-01-1325-80/+206
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Auto-merge.Ramil Kalimullin2010-01-137-6/+47
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ mergeGeorgi Kodinov2010-01-132-6/+9
| | | | |\ \ \ \ \ \
| | | | * | | | | | | version changeGeorgi Kodinov2010-01-131-1/+1
| | | | * | | | | | | merge 5.1-main to 5.1-bugteamGeorgi Kodinov2010-01-138-7/+48
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ MergeKent Boortz2009-12-301-1/+14
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Removed unwanted Perl DBI dependencyKent Boortz2009-12-301-1/+14
| | | | | | * | | | | | | MergeMySQL Build Team2009-12-169-106/+501
| | | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | * | | | | | | | | | Auto-merge.Ramil Kalimullin2010-01-132-55/+69
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | / / / / / | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Auto-merge.Ramil Kalimullin2010-01-132-55/+69
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSLRamil Kalimullin2010-01-132-55/+69
| | | * | | | | | | | | | Automerge from parent - no conflicts.Joerg Bruehe2010-01-1316-13/+81
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | BUG#49222: Mark RAND() as unsafeSven Sandberg2010-01-1313-11/+55
| | | | * | | | | | | | | Bug #50096: CONCAT_WS inside procedure returning wrong dataGleb Shchepa2010-01-133-2/+26
| | | * | | | | | | | | | Upmerge the changes for RPM versioning/naming from 5.0 to 5.1.Joerg Bruehe2010-01-122-6/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| / / / / / / / / | | | | |/ / / / / / / /
| | | | * | | | | | | | Implement the change of RPM versioning and file naming:Joerg Bruehe2010-01-123-10/+20
| | | | * | | | | | | | Merge from main tree,Joerg Bruehe2010-01-121-2/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Raise version number after cloning 5.0.89unknown2009-12-081-2/+2
| | * | | | | | | | | | Bug#48157: crash in Item_field::used_tablesMartin Hansson2010-01-125-3/+94
| | |/ / / / / / / / /
| | * | | | | | | | | Implement the change of RPM versioning and file naming:Joerg Bruehe2010-01-112-5/+12
| | * | | | | | | | | manual merge 5.0-bugteam --> 5.1-bugteam (bug 49955)Gleb Shchepa2010-01-111-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Bug #49955: ld error message: undefined reference to `strmov_overlapp'Gleb Shchepa2010-01-111-2/+2
| | * | | | | | | | | Postfixunknown2010-01-081-3/+24
| | * | | | | | | | | BUG #28421 Infinite loop on slave relay logsunknown2010-01-084-3/+132
| | * | | | | | | | | merge: 5.1-bugteam bug branch --> 5.1 bugteam latest.Luis Soares2010-01-0714-30/+84
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#49479: Slave stops with syntax error: LOAD DATA event without Luis Soares2009-12-0613-30/+67
| | * | | | | | | | | | Addendum to Bug #49734 : fixed an unstable test case.Georgi Kodinov2010-01-062-3/+2
View Lorry Controller Status