summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-08-312-3/+12
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-08-312-3/+12
| |\
| | * Fix GCC 11 -Wmaybe-uninitialized for PLUGIN_PERFSCHEMAMarko Mäkelä2021-08-301-3/+3
| | * rocksdb: disable on arm64 except for LinuxDaniel Black2021-08-261-0/+9
* | | Fix clang -Wunused-but-set-variableMarko Mäkelä2021-08-251-6/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-254-21/+16
|\ \ \ | |/ /
| * | Fixed compile errors when compiling with HAVE_valgrindMichael Widenius2021-08-242-5/+5
| * | MDEV-26465 Race condition in trx_purge_rseg_get_next_history_log()st-10.3-markoMarko Mäkelä2021-08-231-2/+3
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-232-6/+0
| |\ \ | | |/
| | * fix clang buildEugene Kosov2021-08-232-6/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-238-2565/+1041
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-237-2556/+1039
| |\ \ | | |/
| | * MDEV-26383 fixup: Consistently protect freed_indexes with autoinc_mutexMarko Mäkelä2021-08-233-23/+25
| | * MDEV-26383 ASAN heap-use-after-free failure in btr_search_lazy_freeThirunarayanan Balathandayuthapani2021-08-213-3/+18
| | * MDEV-26443 HAVE_C99_INITIALIZERS is not applicable to C++st-10.2-MDEV-26443Marko Mäkelä2021-08-203-2581/+1017
| | * CMakeLists.txt: remove MYSQL_SOURCE_DIR from MYSQL_INCLUDE_DIRSbb-10.2-vicentiu-mrdanielnachun2021-08-191-2/+1
| * | MDEV-26458 Crash on ALTER TABLE after DISCARD TABLESPACEMarko Mäkelä2021-08-231-0/+1
* | | After-merge fixup f84e28c119b495da77e197f7cd18af4048fc3126st-10.4-thiruThirunarayanan Balathandayuthapani2021-08-191-7/+19
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-1827-208/+493
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-181-5/+6
| |\ \ | | |/
| | * MDEV-26131 fixupMarko Mäkelä2021-08-181-5/+6
| * | MDEV-21555 Assertion secondary index is out of sync on delete from versioned ...Aleksey Midenkov2021-08-181-17/+17
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-1818-174/+286
| |\ \ | | |/
| | * MDEV-20931 ALTER...IMPORT can crash the serverEugene Kosov2021-08-177-33/+68
| | * MDEV-26131 SEGV in ha_innobase::discard_or_import_tablespaceThirunarayanan Balathandayuthapani2021-08-161-83/+176
| | * MDEV-26376 pars_info_bind_id() unnecessarily copies stringsMarko Mäkelä2021-08-168-51/+37
| | * cleanup: specifying plugin dependencies in CMakeLists.txtSergei Golubchik2021-08-033-7/+3
| * | MDEV-26206 gap lock is not set if implicit lock existsVlad Lesin2021-08-171-2/+4
| * | MDEV-24523 Execution of JSON_REPLACE failed on SpiderYongxin Xu2021-08-055-0/+167
* | | MDEV-26372 enforce-storage-engine=InnoDB has no usability as an option to mys...Marko Mäkelä2021-08-161-43/+3
* | | Merge branch '10.3' into 10.4mariadb-10.4.21Oleksandr Byelkin2021-08-021-47/+31
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3mariadb-10.3.31Oleksandr Byelkin2021-08-021-47/+31
| |\ \ | | |/
| | * MDEV-20154 Assertion `len <= col->len | ...` failed in row_merge_buf_addNikita Malyavin2021-07-291-36/+29
| | * Cleanup: Remove redundant conditionsMarko Mäkelä2021-07-291-11/+2
* | | MDEV-13564 fixup: Remove unused function fts_check_corrupt()Marko Mäkelä2021-08-022-66/+1
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-31169-1613/+3703
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Oleksandr Byelkin2021-07-29115-1238/+2514
| |\ \ | | |/
| | * Cleanup: Remove dead codeMarko Mäkelä2021-07-281-6/+0
| | * MDEV-7209 mroonga storage engine fails to build on OpenBSDSergei Golubchik2021-07-274-2/+2
| | * Merge remote-tracking branch 'connect/10.2' into 10.2Sergei Golubchik2021-07-27110-1230/+2512
| | |\
| | | * Fix compile error for centos 74 Modified taboccur.cppOlivier Bertrand2021-07-241-0/+2
| | | * Replace Mongo2.jar and Mongo3.jar with ne versionsOlivier Bertrand2021-07-242-0/+0
| | | * - Make user variable prefix recognized by IsArgJson and IsJsonOlivier Bertrand2021-07-2413-61/+111
| | | * Fix clang compile error in value.cppOlivier Bertrand2021-06-251-2/+2
| | | * Fix clang compile error in tabjson and typo in tabbson.cppOlivier Bertrand2021-06-253-5/+5
| | | * Fix clang compile error in tabjson.cpp and tabbson.cppOlivier Bertrand2021-06-252-2/+2
| | | * Fix clang compile error in tabjson.cpp and tabbson.cppOlivier Bertrand2021-06-252-2/+2
| | | * Fix compile error in value.h and remove unused variables in ha_connect.ccOlivier Bertrand2021-06-252-5/+2
| | | * Fix clang compile errorOlivier Bertrand2021-06-241-0/+1
| | | * - Make function strz return null when LEX_STRING is nullOlivier Bertrand2021-06-2412-85/+201