summaryrefslogtreecommitdiff
path: root/storage/federatedx
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-04-031-1/+0
|\
| * Remove unused declarationsMarko Mäkelä2019-04-033-4/+0
* | 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
* | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
| | |\ \ | | | |/
| | | * Correct TRASH() macro usageSergei Golubchik2018-01-221-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-5/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-5/+4
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-5/+4
| | |\ \ | | | |/
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-172-5/+6
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-9/+9
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-174-25/+39
|\ \ \ \ | |/ / /
| * | | MDEV-12725 select on federated table crashes serverSergei Golubchik2017-08-084-25/+37
| * | | 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
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-261-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-11311 Create federated table does not work as expected.Sergei Golubchik2017-05-241-1/+1
* | | | MDEV-11597 Assertion when doing select from virtual column with impossible valueMonty2017-01-111-1/+1
* | | | fix build and some warningskevg2016-11-242-3/+0
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-04-261-17/+9
| | |\ \
| | | * | - Fix an error causing MYSQL table to fail saying "no result set"Olivier Bertrand2016-04-251-17/+9
* | | | | 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-33/+38
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-33/+38
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-8313 Got an error writing communication packetsSergei Golubchik2015-12-071-0/+19
| | * | federatedx small cleanupSergei Golubchik2015-12-071-33/+19
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-0/+1
|\ \ \ \ | |/ / /
| * | | remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-0/+1
* | | | cleanup: use enum_binlog_checksum_alg, not uint8Sergei Golubchik2015-09-041-0/+1
* | | | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-1/+1
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-23/+23
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-23/+23
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * CRLF->LFSergei Golubchik2015-06-022-27/+27
* | | cleanup: freshen up CREATE SERVER codeSergei Golubchik2014-12-041-7/+7
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-025-4/+5
|\ \ \ | |/ /
| * | 5.5.40+ mergeSergei Golubchik2014-10-091-0/+1
| |\ \ | | |/
| | * MDEV-5120 Test suite test maria-no-logging failsSergei Golubchik2014-10-025-0/+5
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-304-4/+4
* | | cleanup: remove table->status from some enginesSergei Golubchik2014-10-011-8/+0
|/ /
* | 5.5 mergeSergei Golubchik2014-05-091-1/+1
|\ \ | |/
| * typo in FederatedX. HA_READ_AFTER_KEY is not a valid index flag.Sergei Golubchik2014-04-141-1/+1
* | remove append_escaped(), use String::append_for_single_quote() insteadSergei Golubchik2014-03-261-3/+3