summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge from 5.1.Guilhem Bichot2011-05-211-1/+1
|\
| * Merge from mysql-5.1.57-releaseKaren Langford2011-05-061-1/+1
| |\
| | * merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-0720-130/+327
| | |\
| | * \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-0917-14/+943
| | |\ \
* | | \ \ Merge from mysql-5.5.12-releaseunknown2011-05-061-1/+1
|\ \ \ \ \
| * \ \ \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-0744-1156/+949
| |\ \ \ \ \
| * \ \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-172-5/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-0952-417/+2036
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge.Sergey Vojtovich2011-03-031-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | BUG#11764339 - valgrind errors, random data when returningSergey Vojtovich2011-03-031-1/+1
* | | | | | | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-062-19/+23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-062-19/+23
| * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-05-0214-152/+275
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-05-028-32/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#60309 - Bug#12356829: MYSQL 5.5.9 FOR MAC OSX HAS BUG WITH FOREIGN KEY C...unknown2011-04-268-32/+43
* | | | | | | | | | | mergeMattias Jonsson2011-04-236-10/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Manual merge from 5.1Mattias Jonsson2011-04-206-10/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | mergeMattias Jonsson2011-04-206-12/+12
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-256-12/+12
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-04-2130-526/+546
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Clarify a comment.Marko Mäkelä2011-04-201-2/+2
| * | | | | | | | Remove a debug printout that is no longer needed.Marko Mäkelä2011-04-201-12/+1
| * | | | | | | | Bug #12329920 ASSERT UT_ERROR IN SYNC_THREAD_LEVELS_NONEMPTY_TRXMarko Mäkelä2011-04-121-22/+22
| * | | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-04-119-78/+199
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Bug #11760042 - 52409: Assertion failure: long semaphore waitMarko Mäkelä2011-04-115-138/+108
| | * | | | | | | Bug #11766513 - 59641: Prepared XA transaction in system after hard crashMarko Mäkelä2011-04-0712-14/+167
| | |/ / / / / /
| | * | | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-04-0414-129/+234
| | |\ \ \ \ \ \
| | * | | | | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-286-1/+93
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Increment InnoDB version from 1.1.6 to 1.1.7Vasil Dimov2011-04-081-1/+1
| * | | | | | | Non-functional change: move a printoutMarko Mäkelä2011-04-062-11/+8
| * | | | | | | Enable __attribute__((cold)) only for GCC 4.3 and later.Marko Mäkelä2011-04-064-3/+16
| * | | | | | | Remove unused functions.Marko Mäkelä2011-04-052-123/+0
| * | | | | | | Bug 12323643 - CLEAN UP THE INNODB THREAD SHUTDOWN AND ASSERTIONS (WL#5136)Marko Mäkelä2011-04-0510-205/+185
| * | | | | | | Bug 12323643 - CLEAN UP THE INNODB THREAD SHUTDOWN AND ASSERTIONS (WL#5136)Marko Mäkelä2011-04-0511-77/+120
* | | | | | | | Merge from mysql-5.5.11-releaseSunanda Menon2011-04-071-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Per Jon Olav, change needed for Bug#11784056MySQL Build Team2011-03-221-1/+0
| * | | | | | | mergeSunanda Menon2011-03-221-1/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Bug#11815600 [ERROR] INNODB COULD NOT FIND INDEX PRIMARYJon Olav Hauglid2011-03-091-1/+0
* | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-04-0442-1152/+857
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-03-303-11/+40
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Bug#11877216 InnoDB too eager to commit suicide on a busy serverMarko Mäkelä2011-03-307-28/+93
| * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-03-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Store the '\0'-terminated query in row->trx_queryVasil Dimov2011-03-281-1/+1
| * | | | | | | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 4 of 4]Marko Mäkelä2011-03-2420-686/+422
| * | | | | | | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 3]Marko Mäkelä2011-03-224-176/+74
| * | | | | | | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 2]Marko Mäkelä2011-03-216-76/+87
| * | | | | | | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 1]Marko Mäkelä2011-03-212-47/+0
| * | | | | | | | Remove trailing white space.Marko Mäkelä2011-03-151-23/+23
| * | | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-03-152-45/+48
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#11849231 inflateInit() invoked without initializing all memoryMarko Mäkelä2011-03-153-45/+53