summaryrefslogtreecommitdiff
path: root/storage/federatedx
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2Michael Widenius2011-03-092-8/+7
|\
| * Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-8/+7
| |\
| | * Fixed build failuresMichael Widenius2011-02-231-6/+2
| | * Applied patch for lp:585688 "maridb crashes in federatedx code" from lp:~atcu...Michael Widenius2011-02-101-1/+3
| * | Merge with alias as StringMichael Widenius2011-02-281-2/+4
| |\ \
| | * | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-2/+4
* | | | Merge with 5.1-release.Michael Widenius2010-12-062-10/+17
|\ \ \ \ | |/ / /
| * | | merge with 5.1Michael Widenius2010-11-301-3/+0
| |\ \ \ | | | |/ | | |/|
| | * | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| * | | Merge MariaDB 5.1->5.2unknown2010-11-192-7/+17
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * MWL#74: Shared libmysqld.so library.unknown2010-11-172-7/+17
* | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-3/+6
|/ /
* | build federared* with libmysqlservicesSergei Golubchik2010-09-121-1/+2
* | merge with 5.1Sergei Golubchik2010-09-112-5/+7
|\ \ | |/
| * build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-4/+3
| * Fixed bugs (mostly on sparc) that caused crashes in mysql-test-runMichael Widenius2010-09-031-1/+4
* | Automerge with 5.1Michael Widenius2010-08-254-94/+250
|\ \ | |/
| * Fixed valgrind errors and compiler warnings discovered by buildbotMichael Widenius2010-08-201-0/+2
| * Fix for LP#571200 MySQL Bug#32426: FederatedX corrupt ORDER BY with TEXTMichael Widenius2010-08-124-94/+248
* | merge with 5.1Sergei Golubchik2010-07-252-4/+8
|\ \ | |/
| * restore the unintentinally broken ABISergei Golubchik2010-07-232-4/+8
* | Merge with MariaDB 5.1Michael Widenius2010-07-171-6/+3
|\ \ | |/
| * Fixed wrong error message from federatedx (which could lead to assert in DBUG...Michael Widenius2010-07-161-6/+3
* | mergeSergei Golubchik2010-06-143-8/+8
|\ \ | |/
| * allow federated and innodb_plugin to be builtSergei Golubchik2010-06-093-7/+7
* | Maria WL#61unknown2010-04-011-1/+18
|/
* Fix some compiler warnings seen in Buildbot.unknown2010-03-101-1/+1
* Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-031-19/+31
|\
| * merge fix for bug monty found in ha_federatedx::close() methodAntony T Curtis2009-11-141-5/+18
| * merge from maria-5.1-mergeAntony T Curtis2009-11-144-11/+15
| |\
| | * Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-112-8/+15
| * | Add missing sources to cmake build.Antony T Curtis2009-11-041-1/+3
| * | fix federated_server test, possible null ptr derefAntony T Curtis2009-11-041-16/+30
| * | Added federatedx storage engineMichael Widenius2009-10-3016-0/+5597
| /
* | Merge with MySQL 5.1, with following additions:unknown2009-11-162-8/+15
|/
* Add federatedx files for buildunknown2009-11-031-1/+1
* Make federated compiling under windowsunknown2009-11-031-1/+7
* Fixed federatedx building under windowsunknown2009-11-021-2/+2
* BUILD/compile-dist && make dist was not working due to typos.Hakan Kuecuekyilmaz2009-11-012-1/+1
* Added federatedx storage engineMichael Widenius2009-10-3016-0/+5601