summaryrefslogtreecommitdiff
path: root/storage/federated
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-193-3/+3
|\
| * Merge 10.2 into 10.3Marko Mäkelä2019-05-143-3/+3
| |\
| | * Merge 10.1 into 10.2Marko Mäkelä2019-05-133-3/+3
| | |\
| | | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-113-3/+3
| | | |\
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-113-3/+3
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-04-031-1/+0
| | |\ \ \ | | | |/ /
| | | * | Remove unused declarationsMarko Mäkelä2019-04-032-2/+0
* | | | | Added new MDL_BACKUP locks for all backup stagesMonty2018-12-091-0/+1
|/ / / /
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-1/+1
| | |\ \
| | | * \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-121-1/+1
| | | |\ \ | | | | |/
| | | | * MDEV-16342 SHOW ENGINES: MyISAM description is uselessSergei Golubchik2018-06-111-1/+1
| | | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-0/+3
| | * | | MDEV-14272 Mariadb crashes with signal 11 when using federatedx engine and ga...Sergei Golubchik2017-12-281-2/+7
* | | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-1/+0
* | | | | Added name to MEM_ROOT for esier debuggingMonty2018-02-021-1/+1
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-9/+9
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-9/+9
* | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-201-62/+7
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-12951 Server crash [mysqld got exception 0xc0000005]Sergei Golubchik2017-09-181-2/+7
| * | | | cleanup: remove dead codeSergei Golubchik2017-09-181-60/+0
* | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-0/+2
| | |\ \ \ | | | |/ /
| | | * | MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthr...Sergei Golubchik2017-07-201-0/+2
| | | * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+2
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+2
* | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-24/+24
* | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-182-2/+2
|/ / / /
* | | | MDEV-11597 Assertion when doing select from virtual column with impossible valueMonty2017-01-111-1/+1
* | | | fix build and some warningskevg2016-11-241-1/+0
* | | | MDEV-6353 my_ismbchar() and my_mbcharlen() refactoringAlexander Barkov2016-05-171-2/+1
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-1/+1
|\ \ \ | |/ /
| * | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-10/+21
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-10/+21
| |\ \ | | |/
| | * MDEV-8313 Got an error writing communication packetsSergei Golubchik2015-12-071-10/+21
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-1/+1
|\ \ \ | |/ /
| * | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-061-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-2/+2
| |\ \ | | |/
| | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-04-271-2/+2
| | |\
| | | * Bug #12671631 CREATE TABLE .. LIKE .. FEDERATED TABLEArun Kuruvila2015-01-281-2/+2
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-3/+3
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-111-3/+3
| | |\ \ | | | |/
| | | * Bug#17599258:- ERROR 1160 (08S01): GOT AN ERROR WRITINGArun Kuruvila2014-11-101-3/+11