summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-1610-3/+179
|\
| * MDEV-19485: Add a test caseMarko Mäkelä2019-05-162-0/+33
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-168-3/+146
| |\
| | * Fixed the case when statistics were not getting read becauseVarun Gupta2019-05-164-1/+29
| | * MDEV-19407: Assertion `field->table->stats_is_read' failed in is_eits_usableVarun Gupta2019-05-164-0/+61
| | * MDEV-788 mysqlimport should support the ability to disable foreign keysRobert Bindar2019-05-153-2/+56
* | | MDEV-16872 Add CAST(expr AS FLOAT)Alexander Barkov2019-05-1612-16/+221
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-152-87/+25
|\ \ \ | |/ /
| * | MDEV-13080 [ERROR] InnoDB: Missing MLOG_CHECKPOINT between the checkpoint x a...Eugene Kosov2019-05-152-88/+32
* | | A cleanup for MDEV-19468: Adding a missing #include <cmath>Alexander Barkov2019-05-151-0/+1
* | | A cleanup for MDEV-19468 Hybrid type expressions return wrong format for FLOATAlexander Barkov2019-05-153-4/+15
* | | MDEV-19468 Hybrid type expressions return wrong format for FLOATAlexander Barkov2019-05-1517-69/+255
* | | MDEV-19445: After-merge fixMarko Mäkelä2019-05-141-4/+4
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-1410-9/+150
|\ \ \ | |/ /
| * | MDEV-19449 Got error 168 for valid TRUNCATE (temporary) TABLEMarko Mäkelä2019-05-142-0/+28
| * | MDEV-17167 - InnoDB: Failing assertion: table->get_ref_count() == 0 uponSergey Vojtovich2019-05-146-1/+89
| * | MDEV-19158: MariaDB 10.2.22 is writing duplicate entries into binary logSujatha2019-05-145-2/+116
| * | Merge branch '10.1' into 10.2Sujatha2019-05-143-7/+5
| |\ \ | | |/
| | * MDEV-11095: rpl.rpl_row_mysqlbinlog test fails if row annotation enabledSujatha2019-05-141-2/+1
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-1431-338/+384
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-1318-368/+369
| |\ \ | | |/
| | * MDEV-19445 heap-use-after-free related to innodb_ft_aux_tableMarko Mäkelä2019-05-1314-318/+341
| | * fts_optimize_words(): Remove stray outputMarko Mäkelä2019-05-132-4/+0
| | * fts_doc_ids_free(): Define inlineMarko Mäkelä2019-05-134-48/+12
| | * MDEV-19441 Typo in error message "InnoDB: FTS Doc ID must be large than"Marko Mäkelä2019-05-134-18/+16
| * | Remove unnecessary pointer indirection for rw_lock_tMarko Mäkelä2019-05-1323-165/+115
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-143630-3682/+3682
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-134033-4087/+4087
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112967-3001/+3001
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-114079-4102/+4102
| | * | Update FSF addressVicențiu Ciorbaru2019-05-11719-725/+725
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11371-380/+380
| | |\ \ | | | |/
| | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-11165-167/+167
| | | * Update FSF addressMichal Schorm2019-05-10217-227/+227
* | | | bump the VERSIONDaniel Bartholomew2019-05-141-1/+1
* | | | Merge branch 'bb-10.3-release' into 10.3Oleksandr Byelkin2019-05-141-112/+141
|\ \ \ \
| * | | | Updated list of unstable tests for 10.3.15 releasemariadb-10.3.15Elena Stepanova2019-05-131-112/+141
* | | | | Fix typo THRASH_FREED_MEMORY->TRASH_FREED_MEMORYVladislav Vaintroub2019-05-131-7/+7
* | | | | MDEV-19452 - fix incorrect push_warning_printfVladislav Vaintroub2019-05-131-5/+8
* | | | | Make TRASH_FREED_MEMORY a cmake option, similar to SAFEMALLOCVladislav Vaintroub2019-05-132-1/+11
|/ / / /
* | | | After-merge fix: Correct a copyright statementMarko Mäkelä2019-05-131-1/+1
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-12255-1185/+3974
|\ \ \ \ | |/ / /
| * | | MDEV-17540 Server crashes in row_purge after TRUNCATE TABLEMarko Mäkelä2019-05-103-0/+60
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1041-986/+851
| |\ \ \ | | |/ /
| | * | 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-108-56/+54