summaryrefslogtreecommitdiff
path: root/storage/federatedx
Commit message (Expand)AuthorAgeFilesLines
* 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-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
* | | MDEV-11311 Create federated table does not work as expected.Sergei Golubchik2017-05-241-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
* | | | 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
* | update plugins' maturity levels:Sergei Golubchik2014-03-191-1/+1
* | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tablesSergey Vojtovich2014-03-201-8/+0
* | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-271-4/+4
* | 10.0-base mergeSergei Golubchik2014-02-262-16/+12
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-252-16/+12
| |\ \ | | |/
| | * federatedx: avoid unnecessary bzero. improve dbug tracesSergei Golubchik2014-02-211-4/+7
| | * MDEV-5698 Using ORDER BY in a FederatedX table is abnormally slowSergei Golubchik2014-02-211-12/+5
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-2/+2
* | | 10.0-monty mergeSergei Golubchik2013-07-211-8/+8
|\ \ \ | |/ / |/| |
| * | Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-5/+5
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-2/+2
* | | 5.5 mergeSergei Golubchik2013-07-171-0/+5
|\ \ \ | | |/ | |/|
| * | MDEV-4468 Assertion `error != 0' fails or timeout occurs on select from a FED...Sergei Golubchik2013-06-071-0/+5
| * | Fixed some cache variables that could be set to higher value than what the co...Michael Widenius2013-06-061-1/+0
* | | MDEV-4708: GTID strict mode doesn't work on a database with purged binlogsunknown2013-07-101-1/+0
* | | 5.5 mergeSergei Golubchik2013-06-061-5/+4
|\ \ \ | |/ /
| * | MDEV-388 Creating a federated table with a non-existing server returns a rand...Sergei Golubchik2013-05-211-3/+2
| * | MDEV-388 Creating a federated table with a non-existing server returns a rand...Sergei Golubchik2013-05-201-1/+1