summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Reverted a temporary workaround for bug #56405 "DeadlockDmitry Lenev2010-09-305-82/+13
* Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-09-3027-126/+494
|\
| * mergeGeorgi Kodinov2010-09-299-13/+60
| |\
| | * Automerge.Ramil Kalimullin2010-09-091-4/+6
| | |\
| | | * Fix for bug#56679: gis.test: valgrind errorRamil Kalimullin2010-09-091-4/+6
| | * | merge 5.1-security => 5.5-securityKristofer Pettersson2010-09-082-1/+14
| | |\ \ | | | |/
| | | * Manual resolve of mysql-test/r/gis.resultKristofer Pettersson2010-09-079-102/+158
| | | |\
| | | * | Bug#55531 crash with conversions of geometry types / stringsKristofer Pettersson2010-09-072-1/+14
| | * | | mergeGeorgi Kodinov2010-09-061-2/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge from mysql-5.1-bugteam to mysql-5.1-securityJimmy Yang2010-09-019-101/+157
| | | |\ \
| | * | \ \ merge from 5.5-mergeGeorgi Kodinov2010-09-0276-3473/+5360
| | |\ \ \ \
| | * \ \ \ \ Automerge.Alexey Kopytov2010-08-263-9/+18
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug #53544: Server hangs during JOIN query in stored procedureAlexey Kopytov2010-08-261-1/+1
| | | | |_|/ | | | |/| |
| | | * | | Automerge.Alexey Kopytov2010-08-243-8/+17
| | | |\ \ \
| | | | * | | Bug #55568: user variable assignments crash server when usedAlexey Kopytov2010-08-243-8/+17
| | | * | | | mergeGeorgi Kodinov2010-08-2014-103/+246
| | | |\ \ \ \
| | * | \ \ \ \ mergeGeorgi Kodinov2010-08-2027-335/+320
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergeGeorgi Kodinov2010-08-201-1/+15
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Bug #55826: create table .. select crashes with when Georgi Kodinov2010-08-201-1/+15
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Bug #55615 and bug #55564Georgi Kodinov2010-08-132-0/+9
| | * | | | | | automerge 5.1-security --> 5.5-security (bug 55424)Gleb Shchepa2010-08-152-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug #55424: convert_tz crashes when fed invalid dataGleb Shchepa2010-08-062-2/+2
| | * | | | | | mergeGeorgi Kodinov2010-08-132-0/+9
| | * | | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-0495-3495/+1613
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergeGeorgi Kodinov2010-08-022-3/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge mysql-trunk-merge to mysql-trunk-securityGeorgi Kodinov2010-08-0215-33/+81
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge from 5.1Alexey Kopytov2010-07-282-2/+18
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-09-2821-113/+438
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix compile warning about passing NULL to non-pointerDmitry Lenev2010-09-241-3/+5
| | * | | | | | | | | | | Merge 5.5 -> 5.5-merge.Konstantin Osipov2010-09-2410-32/+122
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Automerge (most) changes of the 5.5.6-rc release build to main 5.5.Joerg Bruehe2010-09-1010-32/+122
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | A temporary workaround for bug #56405 "Deadlock in theDmitry Lenev2010-09-065-11/+78
| | | | * | | | | | | | | | Cherry-picking patch for Bug#56137 from mysql-5.5-runtime.Alexander Nozdrin2010-08-311-0/+4
| | | | * | | | | | | | | | Cherry-pick patch for Bug#56120 from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-311-2/+7
| | | | * | | | | | | | | | Bug#56387 Create initial database in the proper locationDaniel Fischer2010-08-311-2/+1
| | | | * | | | | | | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0),Alexey Kopytov2010-08-253-19/+39
| | * | | | | | | | | | | | Merged changes from 5.1-bugteam for bug#42503.Dmitry Shulga2010-09-241-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Follow-up for Bug#42503: fix a compilation warning.Dmitry Shulga2010-09-241-0/+2
| | * | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam for bug#56821.Dmitry Shulga2010-09-221-16/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fixed bug#56821 - failure to start the MySQL Service.Dmitry Shulga2010-09-221-16/+30
| | | * | | | | | | | | | | | Bug#46339 - crash on REPAIR TABLE merge table USE_FRMIngo Struewing2010-09-211-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Bug#46339 - crash on REPAIR TABLE merge table USE_FRMIngo Struewing2010-04-261-3/+0
| | * | | | | | | | | | | | | | merge mysql-5.1-bugteam --> mysql-5.5-mergeAlfranio Correia2010-09-171-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-09-171-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | BUG#55961 Savepoint Identifier should be enclosed with backticksAlfranio Correia2010-09-021-2/+6
| | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | | 5.1-bugteam->5.5-mergeSergey Glukhov2010-09-161-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Bug#50402 Optimizer producing wrong results when using Index Merge on InnoDB Sergey Glukhov2010-09-161-3/+8
| | * | | | | | | | | | | | | | Merge from 5.1-bugteamMagne Mahre2010-09-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Bug #54606 innodb fast alter table + pack_keys=0 prevents Magne Mahre2010-09-161-0/+1
| | * | | | | | | | | | | | | | Auto-merge from mysql-5.1-bugteam for bug#42503.Dmitry Shulga2010-09-162-6/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /