summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Fix build on OSXVladislav Vaintroub2012-04-121-0/+5
* mysql 5.5.23 mergeSergei Golubchik2012-04-1033-486/+1140
|\
| * Bug #13817703 - auto_increment_offset != 1 + innodb_autoinc_lock_mode=1 => bu...Sunny Bains2012-03-291-40/+57
| * Bug#13898343 THREAD LOOPS ENDLESSLY IN LF_PINBOX_PUT_PINS WHILE HOLDINGMarc Alff2012-03-281-19/+30
| * Merge from mysql-5.1.Sunny Bains2012-03-282-3/+3
| |\
| | * Merge from mysql-5.0Sunny Bains2012-03-284-8/+8
| | * Merge from mysql-5.1.62-releaseunknown2012-03-203-2/+10
| | |\
| * | | Bug#13704145: ELIMINATE LRU SCAN WHEN DROPPING A TABLEInaam Rana2012-03-266-91/+365
| * | | backport Bug #47707 print some progress messages during shutdown of innodbJimmy Yang2012-03-215-39/+207
| * | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-201-1/+3
| |\ \ \
| * | | | Fix Bug #13860722 - INCOMPLETE PERFORMANCE SCHEMA INSTRUMENTATION IN INNODBJimmy Yang2012-03-204-13/+31
| * | | | merge from 5.1Inaam Rana2012-03-154-49/+54
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#13825266 RACE IN LOCK_VALIDATE() WHEN ACCESSING PAGES DIRECTLYInaam Rana2012-03-155-43/+58
| * | | | merge from 5.1Inaam Rana2012-03-151-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Bug#13851171 STRING OVERFLOW IN INNODB CODE FOUND BY STATIC ANALYSISInaam Rana2012-03-152-0/+8
| * | | | merge from 5.1Inaam Rana2012-03-151-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Bug#13537504 VALGRIND: COND. JUMP/MOVE DEPENDS ON UNINITIALISED VALUESInaam Rana2012-03-152-4/+6
| * | | | Bug#13789853 SHOW ENGINE INNODB STATUS HANGS DUE TO EXCESSIVE WORKInaam Rana2012-03-121-49/+78
| * | | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-03-091-28/+9
| |\ \ \ \ | | |/ / /
| | * | | Bug #11766634 59783: InnoDB data grows unexpectedly when inserting,Annamalai Gurusami2012-03-092-52/+17
| * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-03-081-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix a compiler warning about possibly uninitiaizlied variable.Marko Mäkelä2012-03-082-4/+2
| * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-03-081-21/+49
| |\ \ \ \ | | |/ / /
| | * | | Bug#13807811 BTR_PCUR_RESTORE_POSITION() CAN SKIP A RECORDMarko Mäkelä2012-03-083-43/+102
| * | | | Merge 5.1 => 5.5Tor Didriksen2012-03-062-3/+3
| |\ \ \ \ | | |/ / /
| * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-281-12/+12
| |\ \ \ \ | | |/ / /
| | * | | Fix a mistake in the Bug#12861864 fix.Marko Mäkelä2012-02-281-12/+12
| * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-288-57/+85
| |\ \ \ \ | | |/ / /
| | * | | Bug#12861864 RACE CONDITION IN BTR_GET_SIZE() AND DROP INDEX/TABLE/DATABASEMarko Mäkelä2012-02-289-57/+93
| * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-271-9/+5
| |\ \ \ \ | | |/ / /
| | * | | Remove a bogus BLOB debug assertion that was added in Bug#13721257 fix.Marko Mäkelä2012-02-271-9/+5
| * | | | Fix Bug #64432 Port bug fix #54330 from mysql-5.1 to mysql-5.5Jimmy Yang2012-02-241-31/+62
* | | | | mergeSergei Golubchik2012-04-073-5/+15
|\ \ \ \ \
| * \ \ \ \ merging.Alexey Botchkov2012-04-061-1/+1
| |\ \ \ \ \
| | * \ \ \ \ merging.Alexey Botchkov2012-04-061-1/+1
| | |\ \ \ \ \
| | | * | | | | MDEV-80 Memory engine table full at much less than max_heap_table_size with b...Alexey Botchkov2012-04-061-1/+1
| * | | | | | | mergeSergei Golubchik2012-04-0577-982/+1761
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeSergei Golubchik2012-04-0577-982/+1761
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | mysql-5.1.62 mergeSergei Golubchik2012-04-0577-982/+1763
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1825-583/+1007
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1723-36/+103
| | | | |\ \ \ \
| | | | * \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-0614-62/+528
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ weave merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-01-1229-306/+119
| | | | |\ \ \ \ \ \
| * | | | \ \ \ \ \ \ Merge with 5.2Michael Widenius2012-04-042-11/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge with 5.1Michael Widenius2012-04-042-11/+20
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS...Michael Widenius2012-04-042-11/+20
* | | | | | | | | | | Merge of compatibility fixesMichael Widenius2012-04-026-7/+43
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge from 5.2Michael Widenius2012-03-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Automatic mergeMichael Widenius2012-03-301-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after ...Michael Widenius2012-03-301-1/+1