summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* weave null merge mysql-5.1->mysql-5.5mysql-5.5.13clone-5.5.13-buildGeorgi Kodinov2011-05-100-0/+0
|\
| * weave merge mysql-5.0->mysql-5.1Georgi Kodinov2011-05-100-0/+0
| |\
| | * Merge from mysql-5.0.93-releaseSunanda Menon2011-05-061-0/+1
| | |\
| * | \ Merge from mysql-5.1.57-releaseKaren Langford2011-05-0612-33/+329
| |\ \ \
| | * | | Bug#11867664: Fix server crashes on update with join on partitioned table.mysql-5.1.57unknown2011-04-121-1/+9
* | | | | automerge 5.1->5.5Serge Kozlov2011-05-091-1/+1
* | | | | Patch for Bug#12362125 (SP INOUT HANDLING IS BROKEN FOR TEXT TYPE).Alexander Nozdrin2011-05-093-4/+68
* | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTSAlexander Nozdrin2011-05-063-23/+59
* | | | | Patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-061-2/+5
* | | | | Preliminary patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-066-13/+21
* | | | | Add --with-debug=full support to BUILD/* scripts, this option has been lostMagnus Blåudd2011-05-061-1/+9
* | | | | Merge in patch for bug 12380149Magnus Blåudd2011-05-061-1/+1
* | | | | Merge from mysql-5.5.12-releaseunknown2011-05-0620-55/+330
|\ \ \ \ \
| * \ \ \ \ Auto-merge from mysql-5.5.mysql-5.5.12clone-5.5.12-buildAlexander Nozdrin2011-04-0811-6/+197
| |\ \ \ \ \
| * \ \ \ \ \ Empty merge from mysql-5.1-security.Alexander Nozdrin2011-04-080-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Auto-merge from mysql-5.1.clone-5.1.57-buildAlexander Nozdrin2011-04-0821-78/+91
| | |\ \ \ \ \
| * | \ \ \ \ \ Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-0824-145/+231
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fixed a number for a missing warningGeorgi Kodinov2011-04-071-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | fixed a missing warningGeorgi Kodinov2011-04-071-0/+2
| * | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-04-071-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-04-070-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | merge mysql-5.0->mysql-5.0-securitymysql-5.0.93clone-5.0.93-buildGeorgi 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | |