summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-142184-2206/+2206
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-132566-2589/+2589
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111605-1623/+1623
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-112844-2849/+2849
| | * | Update FSF addressVicențiu Ciorbaru2019-05-11676-678/+678
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11287-290/+290
| | |\ \ | | | |/
| | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-11149-149/+149
| | | * Update FSF addressMichal Schorm2019-05-10142-142/+142
* | | | After-merge fix: Correct a copyright statementMarko Mäkelä2019-05-131-1/+1
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-1250-553/+992
|\ \ \ \ | |/ / /
| * | | MDEV-17540 Server crashes in row_purge after TRUNCATE TABLEMarko Mäkelä2019-05-101-0/+8
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1036-935/+746
| |\ \ \ | | |/ /
| | * | MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot ...Thirunarayanan Balathandayuthapani2019-05-102-16/+2
| | * | MDEV-18220: race condition in fts_get_table_name()Marko Mäkelä2019-05-108-34/+66
| | * | MDEV-18220: Backport some code from MariaDB 10.2Marko Mäkelä2019-05-1014-536/+612
| | * | MDEV-18220: heap-use-after-free in fts_get_table_name_prefix()Marko Mäkelä2019-05-1016-74/+28
| | * | MDEV-18220: Remove some redundant data structuresMarko Mäkelä2019-05-106-326/+270
| | * | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-107-55/+53
| | * | Removed dead codeSergey Vojtovich2019-05-091-57/+0
| | * | MDEV-16060 - InnoDB: Failing assertion: ut_strcmp(index->name, key->name)Sergey Vojtovich2019-05-092-0/+8
| * | | MDEV-19408 Assertion on trx->state failed in ReadView::copy_trx_idsmariadb-10.2.24Marko Mäkelä2019-05-081-2/+11
| * | | MDEV-13942 InnoDB SPATIAL INDEX corruption during root page splitqingda20192019-05-071-1/+8
| * | | changes in innodb has influence on this test in rocksdb test suiteOleksandr Byelkin2019-05-061-3/+3
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-064-33/+50
| |\ \ \ | | |/ /
| | * | Revert "MDEV-19399 do not call slow my_timer_init() several times"Marko Mäkelä2019-05-065-49/+55
| | * | MDEV-18214 remove some duplicated MONITOR countersEugene Kosov2019-05-064-48/+50
| | * | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-065-55/+49
| * | | fix of resultsOleksandr Byelkin2019-05-051-49/+49
| * | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2019-05-052-52/+49
| |\ \ \
| | * | | Fixed compiler warning in connect engineOlivier Bertrand2019-03-251-1/+1
| | * | | TypoOlivier Bertrand2019-03-241-5/+7
| | * | | - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode=''Olivier Bertrand2019-03-234-84/+78
| | * | | - Fix MDEV-18292: CONNECT Engine JDBC not able to issueOlivier Bertrand2019-03-033-46/+44
| | * | | Fix xml result by setting eol as lf modified: storage/connect/mysql-test/con...Olivier Bertrand2019-02-091-393/+393
| | * | | Fix xml result mismatch modified: storage/connect/mysql-test/connect/r/xml.re...Olivier Bertrand2019-02-091-344/+344
| | * | | - Fix GetTableName that returned wrong value under WindowsOlivier Bertrand2019-02-091-1/+1
| * | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-0427-160/+305
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-19265 Server should throw warning if event is created and event_schedule...Vladislav Vaintroub2019-04-281-0/+2
| | * | | CONNECT compilation failureSergei Golubchik2019-04-263-11/+3
| | * | | Merge branch 'merge-tokudb-5.6' into 10.1Sergei Golubchik2019-04-269-13/+109
| | |\ \ \
| | | * | | 5.6.43-84.3Sergei Golubchik2019-04-2643-1088/+1888
| | * | | | Squashed commit of connect/10.0:Olivier Bertrand2019-04-2614-180/+296
| | * | | | MDEV-19331 Merge new release of InnoDB 5.6.44 to 10.1Marko Mäkelä2019-04-257-15/+61
| | |\ \ \ \
| | | * | | | Bug#28573894 ALTER PARTITIONED TABLE ADD AUTO_INCREMENT DIFF RESULT DEPENDING...Marko Mäkelä2019-04-252-2/+36
| | | * | | | Clean up ib_sequence::m_max_valueMarko Mäkelä2019-04-254-8/+18
| | | * | | | Bug #19811005 ALTER TABLE ADD INDEX DOES NOT UPDATE INDEX_LENGTH IN I_S TABLESAakanksha Verma2019-04-252-4/+6
| | |/ / / /
| | * | | | 5.6.43-84.3Marko Mäkelä2019-04-252-3/+5
| | |\ \ \ \
| | | * | | | PS-4989: Fixing innodb_track_changed_pages debug validationZsolt Parragi2019-04-251-1/+3
| | |/ / / /
* | | | | | cleanup: remove dead codeSergei Golubchik2019-05-072-92/+1
* | | | | | cleanup: move checksum code to handler classSergei Golubchik2019-05-074-14/+2