summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Removed variables no longer needed in plugins, moved to methods insteadMikael Ronstrom2011-05-132-15/+10
* mergeMikael Ronström2011-05-121-2/+5
|\
| * Bug#12346411 SQL/LOG.CC:6509: ASSERTION `PREPARED_XIDS > 0' FAILEDJon Olav Hauglid2011-05-121-2/+5
* | mergeMikael Ronström2011-05-1220-83/+342
|\ \ | |/
| * auto-mergeTatjana Azundris Nuernberg2011-05-1252-548/+1552
| |\
| | * auto-mergeTatjana Azundris Nuernberg2011-05-1251-539/+1541
| | |\
| | | * Bug #11744875: 4082: integer lengths cause truncation with distinct concat Georgi Kodinov2011-05-111-0/+58
| | | * Patch for Bug#12362125 (SP INOUT HANDLING IS BROKEN FOR TEXT TYPE).Alexander Nozdrin2011-05-091-2/+20
| | | * Patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-061-2/+5
| | | * Preliminary patch for Bug#11848763 / 60025Alexander Nozdrin2011-05-066-13/+21
| | | * Merge in patch for bug 12380149Magnus Blåudd2011-05-061-1/+1
| | | * Merge from mysql-5.5.12-releaseunknown2011-05-064-42/+170
| | | |\
| | | | * Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-085-6/+51
| | | | |\
| | | | * \ Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-083-29/+27
| | | | |\ \
| | | | * \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-0716-90/+328
| | | | |\ \ \
| | | | * | | | Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIESTor Didriksen2011-03-241-1/+5
| | | | * | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-214-31/+44
| | | | |\ \ \ \
| | | | * | | | | Fixed a post-merge embedded compilation errorGeorgi Kodinov2011-03-171-0/+2
| | | | * | | | | merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-1720-61/+226
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ auto-mergeGeorgi Kodinov2011-03-151-0/+13
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING DOESN'T Georgi Kodinov2011-03-151-0/+13
| | | | | * | | | | | automergeKristofer Pettersson2011-03-119-48/+156
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-099-48/+156
| | | | | | |\ \ \ \ \ \
| | | | | * | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-111-22/+145
| | | | | |/ / / / / / /
| | | | | * | | | | | | Bug#11767480 - SPATIAL INDEXES ON NON-SPATIAL COLUMNS CAUSE CRASHES.Magne Mahre2011-02-241-6/+16
| | | | * | | | | | | | automergeKristofer Pettersson2011-03-141-9/+6
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) Jorgen Loland2011-03-141-9/+6
| | | | * | | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-141-32/+144
| | | | |/ / / / / / / /
| | | | * | | | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-0941-587/+506
| | | | |\ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-062-9/+11
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-062-11/+12
| | | * | | | | | | | | | | BUG#12425924Luis Soares2011-05-061-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Automerged (cherrypicked) cset from 5.6:Luis Soares2011-05-041-0/+3
| | | * | | | | | | | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2011-05-041-0/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| / / / / / / / / / / | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Patch for Bug#12394306: the sever may crash if mysql.event is corrupted.Alexander Nozdrin2011-05-041-0/+8
| | | | * | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-05-021-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-04-2112-42/+69
| | | | | |\ \ \ \ \ \ \ \ \ \
| | * | | | \ \ \ \ \ \ \ \ \ \ auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-123-9/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-123-9/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ auto-merge conservative fix for Bug#55436/Bug#11762799Tatiana Azundris Nurnberg2011-05-053-9/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:...Tatiana A. Nurnberg2010-11-113-9/+11
| * | | | | | | | | | | | | | | | | auto-mergeTatjana Azundris Nuernberg2011-05-122-5/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Bug#11902767/Bug#60580: Statement improperly replicated crashes slave SQL threadTatjana Azundris Nuernberg2011-05-122-5/+20
* | | | | | | | | | | | | | | | | | mergeMikael Ronstrom2011-05-0411-172/+391
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix of partitioning tests that fails on windows + merge of minor cleanupMattias Jonsson2011-04-291-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | removed dead obsolete codeMattias Jonsson2011-04-291-6/+0
| * | | | | | | | | | | | | | | | | mergeMattias Jonsson2011-04-271-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Post push fix for bug#11766249 bug#59316Mattias Jonsson2011-04-271-3/+6
| * | | | | | | | | | | | | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-04-271-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE C...Sergey Glukhov2011-04-271-3/+3
View Lorry Controller Status