summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-04-070-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-04-0726-357/+226
| | | | | |\ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-0787-612/+1222
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-03-211-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | mergeGeorgi Kodinov2011-03-211-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Bug #59815: Missing License information with enterprise GPL packagesGeorgi Kodinov2011-02-081-0/+1
| | | | | * | | | | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-03-214-2210/+22
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-03-216-2256/+52
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-07141-2231/+2953
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIESTor Didriksen2011-03-245-7/+41
| | | * | | | | | | | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-03-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-216-2256/+52
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | / / / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-2154-2557/+630
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fixed the test cleanup code post-mergeGeorgi Kodinov2011-03-172-0/+2
| | | * | | | | | | | | | | | | | | | | | Fixed a post-merge embedded compilation errorGeorgi Kodinov2011-03-171-0/+2
| | | * | | | | | | | | | | | | | | | | | merge 5.1-security->5.5-securityGeorgi Kodinov2011-03-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | merge 5.1->5.1-securityGeorgi Kodinov2011-03-1787-29/+417
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-17167-186/+1501
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeGeorgi Kodinov2011-03-153-0/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING DOESN'T Georgi Kodinov2011-03-153-0/+42
| | | | * | | | | | | | | | | | | | | | | | | automergeKristofer Pettersson2011-03-1171-642/+2051
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ automergeKristofer Pettersson2011-03-143-9/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) Jorgen Loland2011-03-143-9/+46
| | | * | | | | | | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-141-32/+144
| | | |/ / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | Null merge 5.1 to 5.5.Kristofer Pettersson2011-03-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-111-22/+145
| | | * | | | | | | | | | | | | | | | | | | | | merge 5.1-security->5.5-securityGeorgi Kodinov2011-03-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Fixed a wrong error code in gis.testGeorgi Kodinov2011-03-092-3/+2
| | | * | | | | | | | | | | | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-03-092-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | merge 5.0-security->5.1-securityGeorgi Kodinov2011-03-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-03-091-7/+16
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-0968-641/+2020
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-09202-1826/+5013
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge.Sergey Vojtovich2011-03-033-1/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | BUG#11764339 - valgrind errors, random data when returningSergey Vojtovich2011-03-033-1/+32
| | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge from mysql-5.1-securityMagne Mahre2011-02-242-4/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | Bug#11767480 - SPATIAL INDEXES ON NON-SPATIAL COLUMNS CAUSE CRASHES.Magne Mahre2011-02-243-6/+96
| | | * | | | | | | | | | | | | | | | | | | | | | | Null mergeMagne Mahre2011-02-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.1.56Jonathan Perkin2011-02-111-1/+1
| | | * | | | | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.5.10Jonathan Perkin2011-02-111-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | BUG#12354268Luis Soares2011-05-063-1/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | BUG#12354268Luis Soares2011-05-063-1/+41
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | BUG#12354268: MYSQLBINLOG --BASE64-OUTPUT=DECODE-ROWS DOES NOTLuis Soares2011-05-053-1/+41
| | * | | | | | | | | | | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-0610-59/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-0610-61/+70
| | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | BUG#12425924Luis Soares2011-05-062-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ BUG#12425924: SEMI-SYNC RELATED VALGRIND WARNINGS IN 5.5 CODEBASELuis Soares2011-05-042-2/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Automerged (cherrypicked) cset from 5.6:Luis Soares2011-05-041-0/+3
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Automerged (cherrypicked) cset from 5.6:Luis Soares2011-05-041-2/+2
| | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2011-05-045-56/+186
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / /