summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Fix InnoDB style after mikael@dator8-20101217205840-i7ltx8m6z3uc42khVasil Dimov2011-01-071-4/+4
* Merge mysql-5.5 -> mysql-5.5-innodbVasil Dimov2011-01-07106-2795/+994
|\
| * mergeMikael Ronstrom2011-01-03106-2794/+990
| |\
| | * MergeKent Boortz2010-12-29105-2793/+989
| | |\
| | | * MergeKent Boortz2010-12-29105-2793/+989
| * | | BUG#59013, make partition handler not miss HA_STATUS_NO_LOCK, add HA_STATUS_V...Mikael Ronstrom2010-12-171-2/+5
* | | | merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-01-063-3/+15
|\ \ \ \
| * | | | Fix Bug #55397 cannot select from innodb_trx when trx_query contains blobsJimmy Yang2011-01-064-3/+19
* | | | | Fix Bug #58653 - Sporadic crash due to assertion failure 0 == space->n_pendin...Sunny Bains2011-01-063-0/+57
* | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-066-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | (InnoDB Plugin) Fix Bug#59303 Correct URL in crash messageVasil Dimov2011-01-066-7/+7
| * | | | (Builtin InnoDB) Fix Bug#59303 Correct URL in crash messageVasil Dimov2011-01-067-9/+9
* | | | | merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-01-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix Bug #59197 double quote in field comment prevents foreign keyJimmy Yang2011-01-043-2/+7
| * | | | Fix Bug #59157 valgrind conditional jump warning from dict_load_foreign.Jimmy Yang2011-01-041-0/+2
| * | | | Fix a build error on Windows, introduced by revision-id:Calvin Sun2010-12-271-2/+2
* | | | | PS-instrument the array of latches (rw locks) dict_table_stats_latches[].Vasil Dimov2011-01-043-2/+5
* | | | | Fix a build error on Windows, introduced by revision-id:Calvin Sun2010-12-271-2/+2
* | | | | Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-211-1/+1
| | |/ / | |/| |
* | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-12-218-257/+322
|\ \ \ \ | | |/ / | |/| |
| * | | Bug #55284 Double BLOB free due to lock wait while updating PRIMARY KEYMarko Mäkelä2010-12-216-213/+228
| * | | Bug#58912 InnoDB unnecessarily avoids update-in-place on column prefix indexesMarko Mäkelä2010-12-218-40/+110
| * | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-12-122-2/+12
| |\ \ \ | | | |/ | | |/|
* | | | Increment InnoDB version from 1.1.4 to 1.1.5 Vasil Dimov2010-12-161-1/+1
* | | | Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-123-54/+57
|\ \ \ \ | | |_|/ | |/| |
| * | | Manual merge from mysql-5.1-bugteam for bug#54486.Dmitry Shulga2010-12-101-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fixed bug#54486 - assert in my_seek, concurrentDmitry Shulga2010-12-101-0/+2
| | * | Fix for bug#48451: my_seek and my_tell ignore MY_WME flagRamil Kalimullin2010-12-091-2/+10
| * | | Merge fix for BUG58205 to 5.5-bugteam.Sergey Vojtovich2010-12-081-1/+2
| |\ \ \
| | * | | BUG#58205 - Valgrind failure in fn_format when called fromSergey Vojtovich2010-12-011-1/+2
| * | | | Bug#58798 SHOW ENGINE PERFORMANCE_SCHEMA STATUS: incorrect table lettercaseMarc Alff2010-12-071-53/+53
* | | | | 55222 - Previous patch had a bug in unused code which was reactivated inkevin.lewis@oracle.com2010-12-091-4/+9
* | | | | Merge from mysql-5.1-innodb to mysql-5.5-innodb.Jimmy Yang2010-12-091-4/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix Bug #57600 output of I/O sum[%lu] can go negativeJimmy Yang2010-12-092-4/+16
* | | | | Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-056-15/+33
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bug#53696 Performance schema engine violates the PSEA API by calling my_error()Marc Alff2010-12-016-15/+33
| | |/ / | |/| |
* | | | Cherry pick vasil.dimov@oracle.com-20101201140708-fsc5xlu9bkpov6pvVasil Dimov2010-12-031-1/+16
* | | | Define MYSQL_(MAJOR|MINOR)_VERSION the way things are defined in CMakeVasil Dimov2010-12-021-4/+0
* | | | Merge from mysql-5.5-innodb to local.Marko Mäkelä2010-12-021-0/+2
|\ \ \ \
| * | | | Use "rep; nop" in InnoDB if it is available and "pause" is notVasil Dimov2010-12-021-0/+2
* | | | | Fix UNIV_MEM_DEBUG compilation failure caused by Bug#58226 fix.Marko Mäkelä2010-12-021-6/+6
|/ / / /
* | | | Bug#58212 Possible deadlock in change buffer in debug buildsMarko Mäkelä2010-12-013-27/+135
* | | | Bug#58226 Some InnoDB debug checks consume too much CPU timeMarko Mäkelä2010-12-017-26/+102
* | | | Fix a compilation error that was introduced in the Bug #55222 fixMarko Mäkelä2010-12-011-2/+2
* | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-12-011-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#58623: Bogus debug assertion failure in i_s_locks_row_validate()Marko Mäkelä2010-12-011-1/+1
| * | | RB://518 approved by Jimmy Yang and Sunny bainskevin.lewis@oracle.com2010-11-301-93/+89
| * | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-11-293-8/+18
| |\ \ \ | | | |/ | | |/|
| | * | mergeGeorgi Kodinov2010-11-263-8/+18
| | |\ \
View Lorry Controller Status