summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | null upmerge 11757091Bjorn Munch2011-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #11757091 49093: 5.1 CONFIGURE SCRIPT SHOULD WARN ABOUT MYSQL CLUSTER NOT...Bjorn Munch2011-07-011-0/+9
| | * | | | | | | | | | 11766640 addendum: disable unit tests in MTR with --do-test or --start-fromBjorn Munch2011-06-302-1/+4
| | * | | | | | | | | | null upmergeBjorn Munch2011-06-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | merge from 5.1 mainBjorn Munch2011-06-29161-1775/+3776
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ merge from 5.5 mainBjorn Munch2011-06-29207-2250/+9098
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SE...Tor Didriksen2011-07-183-1/+36
| * | | | | | | | | | | | | Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER.Tor Didriksen2011-07-183-1/+24
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2011-07-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).Alexander Nozdrin2011-07-151-2/+2
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Automerge from mysql-5.1 into mysql-5.5.Luis Soares2011-07-151-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | DBUG_PRINT in solaris does not work well with NULL parameters.Luis Soares2011-07-151-4/+11
| * | | | | | | | | | | BUG#11753004Luis Soares2011-07-144-12/+301
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | BUG#11753004: 44360: REPLICATION FAILEDLuis Soares2011-07-144-12/+301
| * | | | | | | | | | | Bug#12561297 : Disabled the testAnitha Gopi2011-07-141-0/+1
| * | | | | | | | | | | build 5.5.15MySQL Release Engineering2011-07-131-1/+1
| * | | | | | | | | | | BUG#12695969Luis Soares2011-07-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | BUG#12695969Luis Soares2011-07-121-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | BUG#12695969Luis Soares2011-07-121-1/+1
| * | | | | | | | | | BUG#12695969Luis Soares2011-07-112-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | BUG#12695969Luis Soares2011-07-112-4/+33
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTIONLuis Soares2011-07-112-7/+34
| * | | | | | | | | | Null Merge from mysql-5.1 with second fix for Bug#12637786kevin.lewis@oracle.com2011-07-083-8/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Bug#12637786 was fixed with rb:692 by marko. But that fix has a remainingkevin.lewis@oracle.com2011-07-073-8/+17
| * | | | | | | | | | Upmerge the 45415 fix from 5.1 to 5.5Joerg Bruehe2011-07-071-3/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix bug#45415: "rpm upgrade recreates test database"Joerg Bruehe2011-07-071-3/+13
| * | | | | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-0711-48/+35
* | | | | | | | | | | Bug #12319710: INVALID MEMORY READ AND/OR CRASH IN MY_UCA_CHARCMP Georgi Kodinov2011-07-223-9/+86
* | | | | | | | | | | Merged the fix of bug #12779790 to mysql-5.5-securityGeorgi Kodinov2011-07-226-15/+0
* | | | | | | | | | | Bug#12368853 FORMAT() CRASHES WITH LARGE NUMBERS AFTER TRUNCATE...Tor Didriksen2011-07-183-1/+14
* | | | | | | | | | | automerge 5.1->security => 5.5-securityTor Didriksen2011-07-182-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | automerge 5.0->security => 5.1-securityTor Didriksen2011-07-182-6/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#12406055 post-push fix: ignore float outputTor Didriksen2011-07-182-6/+5
* | | | | | | | | | | | NULL merge (except for test) 5.1-security => 5.5-securityTor Didriksen2011-07-152-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | merge 5.0-security => 5.1-securityTor Didriksen2011-07-156-5/+44
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-156-5/+44
* | | | | | | | | | | | Bug#12736295 Buffer overflow for variable converted_err withDavi Arnaut2011-07-153-3/+30
* | | | | | | | | | | | merge 5.1-security => 5.5-securityTor Didriksen2011-07-116-8/+145
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC...Tor Didriksen2011-07-116-9/+145
| * | | | | | | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | weave merge of mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-07-07291-564/+832
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-07-07714-2550/+4443
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-07-07943-2883/+4315
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-07-071-16/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | empty weave merge from mysql-5.0Georgi Kodinov2011-07-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge from mysql-5.0.94-releaseSunanda Menon2011-07-0627-523/+424
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.58-releaseKaren Langford2011-07-0630-679/+594
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Small update to Patch to fix SS #12698716Karen Langford2011-07-011-3/+3
| | | * | | | | | | | | | Patch to fix SS #12698716 : Java/ConnectorJ regression problemKaren Langford2011-07-011-0/+20
| * | | | | | | | | | | | Merge from mysql-5.5.14-releasehery.ramilison@oracle.com2011-07-0642-684/+736
| |\ \ \ \ \ \ \ \ \ \ \ \