summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge mwl#55Vladislav Vaintroub2011-03-113-33/+18
|\
| * merge 5.2Vladislav Vaintroub2011-03-10265-4801/+5546
| |\
| * | MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build Vladislav Vaintroub2011-02-041-2/+15
| * | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-33/+18
* | | Merge with 5.2Michael Widenius2011-03-09269-4798/+5539
|\ \ \ | | |/ | |/|
| * | Fixed wrong filenames in maria unittest that caused unittest to failMichael Widenius2011-03-011-2/+2
| * | Merge with 5.1 to get fixes for tests and compiler warningsMichael Widenius2011-03-011-2/+2
| |\ \
| | * | Get rid of compiler warningsMichael Widenius2011-02-281-2/+2
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-28266-4793/+5549
| |\ \ \ | | |/ /
| | * | Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55Michael Widenius2011-02-26228-4400/+4747
| | |\ \
| | | * | Fixed compiler warningsMichael Widenius2011-02-251-2/+2
| | | * | Fixed compiler and build error:Michael Widenius2011-02-252-1/+3
| | | * | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-2511-132/+192
| | | * | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+2
| | | * | Fixed build failuresMichael Widenius2011-02-234-12/+10
| | | * | Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-2227-404/+671
| | | * | Merge with xtradb code changesMichael Widenius2011-02-2248-427/+1762
| | | |\ \
| | | | * | Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-0448-427/+1762
| | | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-20156-3506/+2189
| | | |\ \ \
| | | | * \ \ mergeGeorgi Kodinov2011-01-1032-393/+521
| | | | |\ \ \
| | | | | * | | Increment InnoDB Plugin version from 1.0.14 to 1.0.15.Vasil Dimov2011-01-081-1/+1
| | | | | * | | Followup to vasil.dimov@oracle.com-20110107091222-q23qpb5skev0j9gcVasil Dimov2011-01-071-12/+15
| | | | | * | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-07105-2793/+989
| | | | | |\ \ \
| | | | | * | | | Fix Bug#59327 Fix autoconf usage for innodb_pluginVasil Dimov2011-01-071-10/+14
| | | | | * | | | Fix Bug #55397 cannot select from innodb_trx when trx_query contains blobsJimmy Yang2011-01-064-3/+19
| | | | | * | | | (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
| | | | | * | | | 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
| | | | | * | | | 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
| | | | | |\ \ \ \
| | | | | * | | | | Fix Bug #57600 output of I/O sum[%lu] can go negativeJimmy Yang2010-12-092-4/+16
| | | | | * | | | | 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 bainsunknown2010-11-301-93/+89
| | | | | * | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-11-293-8/+18
| | | | | |\ \ \ \ \
| | | | | * | | | | | Bug#47350 Support innodb plugin without separate shared objectVasil Dimov2010-11-251-0/+3
| | | | | * | | | | | Fix bug# 18274 InnoDB auto_increment field reset on OPTIMIZE TABLESunny Bains2010-11-241-11/+13
| | | | * | | | | | | automergeGeorgi Kodinov2011-01-07105-2793/+989
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | |
| | | | | * | | | | | MergeKent Boortz2010-12-29105-2793/+989
| | | | | | |_|/ / / | | | | | |/| | | |
| | | | * | | | | | Backport Bug #58643 InnoDB: too long table name. Also fix Bug #59312 examineJimmy Yang2011-01-066-17/+40
| | | | * | | | | | mergeGeorgi Kodinov2010-12-172-2/+12
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | 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
| | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | mergeGeorgi Kodinov2010-11-263-8/+18
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | Fix Bug# 56228 - Dropping tables from within an active statement crashes serverSunny Bains2010-11-303-3/+123
| | | | * | | | | Manual-merge from mysql-5.1-bugteam.Ramil Kalimullin2010-11-2229-374/+661
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-11-1829-374/+661
| | | | | |\ \ \ \
| | | | | | * | | | Fix a debug assertion failure in the Bug#57802 fix.Marko Mäkelä2010-11-111-2/+3
View Lorry Controller Status