summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Temporary commit of 10.0-mergeMichael Widenius2013-03-26253-16850/+50125
* 10.0-base mergeSergei Golubchik2013-01-3129-269/+459
|\
| * 5.5 mergeSergei Golubchik2013-01-2926-239/+431
| |\
| | * MDEV-4065 thd_kill_statement serviceSergei Golubchik2013-01-181-9/+8
| | * mysql-5.5.29 mergeSergei Golubchik2013-01-158-42/+108
| | |\
| | | * Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-221-1/+5
| | | |\
| | | * \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-181-7/+12
| | | |\ \ | | | | |/
| | | * | Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90SYasufumi Kinoshita2012-10-171-3/+4
| | | |\ \
| | | * \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-163-6/+35
| | | |\ \ \ | | | | |/ /
| | | * | | bug#14704286Krunal Bauskar krunal.bauskar@oracle.com2012-10-151-0/+5
| | | * | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-10-092-1/+17
| | | |\ \ \
| | | * | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITHAnnamalai Gurusami2012-10-081-2/+2
| | | * | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-083-4/+24
| | | |\ \ \ \
| | | * \ \ \ \ Merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-09-283-79/+0
| | | |\ \ \ \ \
| | | * | | | | | Bug#14594600 ASSERT FROM DROP TABLE CONCURRENT WITH IBUF MERGESInaam Rana2012-09-201-24/+47
| | | * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-09-194-6/+36
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-09-179-90/+164
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Bug #14500557 CRASH WHEN USING LONG INNODB INDEXESAnnamalai Gurusami2012-09-042-4/+8
| | | * | | | | | | | Merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-09-012-4/+34
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | * | | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-08-303-2/+35
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | * | | | | | | | Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ON WINDOWSAditya A2012-08-271-5/+5
| | * | | | | | | | | 5.3 mergeSergei Golubchik2013-01-1522-195/+291
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ 5.2->5.3 mergeSergei Golubchik2013-01-1011-106/+93
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-0911-106/+93
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | | | | * | | | | | | | Bug#14758405: ALTER TABLE: ADDING SERIAL NULL DATATYPE: ASSERTION:Marko Mäkelä2012-10-181-7/+12
| | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | | | * | | | | | | bug#14704286Krunal Bauskar krunal.bauskar@oracle.com2012-10-151-1/+5
| | | | | * | | | | | | Fix compilation error in debug mode:Vasil Dimov2012-10-101-14/+13
| | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | | | * | | | | | Port the test for Bug#14708715 from 5.1/innodb_plugin into 5.1/innodbVasil Dimov2012-10-091-0/+16
| | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | * | | | | Bug#14731482 UPDATE OR DELETE CORRUPTS A RECORD WITH A LONG PRIMARY KEYMarko Mäkelä2012-10-082-4/+21
| | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | Bug #13249921 ASSERT !BPAGE->FILE_PAGE_WAS_FREED, USUALLY IN Annamalai Gurusami2012-09-283-80/+2
| | | | | | |_|/ | | | | | |/| |
| | | | | * | | Bug#14636528 INNODB CHANGE BUFFERING IS NOT ENTIRELY CRASH-SAFEMarko Mäkelä2012-09-194-14/+38
| | | | | | |/ | | | | | |/|
| | * | | | | remove thd_mark_as_hard_kill()Sergei Golubchik2013-01-151-1/+1
| | * | | | | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-2/+33
| * | | | | | Fix missing #includeunknown2013-01-161-0/+1
| * | | | | | MDEV-3990: engine tests went out of sync with current MariaDB codeElena Stepanova2013-01-132-1/+12
* | | | | | | After-merge fixes for merge 10.0-base -> 10.0.unknown2012-12-181-0/+1
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-185-4/+182
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-1616-89/+2072
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 5.3->5.5 mergeSergei Golubchik2012-11-223-2/+35
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-37/+32
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-062-38/+32
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Bug#14547952: DEBUG BUILD FAILS ASSERTION IN RECORDS_IN_RANGE()Jorgen Loland2012-08-281-1/+0
| | | * | | | remove mysql-5.1 assert that is already absent in mysql-5.5Sergei Golubchik2012-08-231-1/+0
| | | * | | | 5.2 merge.Sergei Golubchik2012-08-227-8/+42
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-227-8/+42
| | | | |\ \ \
| | | * | \ \ \ 5.2 mergeSergei Golubchik2012-05-209-50/+97
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | merge with mysql-5.1.63Sergei Golubchik2012-05-179-50/+97
| | | | |\ \ \ \
| * | | | | | | | MDEV-532: Async InnoDB commit checkpoint.unknown2012-12-145-4/+183
| * | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-6/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-6/+0
View Lorry Controller Status