summaryrefslogtreecommitdiff
path: root/storage/federated
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-1/+1
|\
| * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-1/+1
| |\
| | * Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-261-1/+1
* | | mergeSergei Golubchik2012-04-052-2/+12
|\ \ \ | |/ /
| * | mysql-5.1.62 mergeSergei Golubchik2012-04-052-2/+12
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | * Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITINGRamil Kalimullin2011-12-231-1/+2
| | * Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITING Ramil Kalimullin2011-12-231-0/+9
* | | Merge with 5.1Michael Widenius2011-11-301-1/+1
|\ \ \ | |/ /
| * | test both federated and federatedX in the federated suite.Sergei Golubchik2011-11-301-1/+1
* | | Merge with MariaDB 5.1Michael Widenius2011-11-244-7/+10
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+1
| |\ \ | | |/
| | * Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGINBjorn Munch2011-09-051-2/+2
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-214-6/+9
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2011-06-304-6/+9
* | | Merge with 5.1Michael Widenius2011-01-121-2/+0
|\ \ \ | |/ /
| * | Fix for LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX' failed wit...Michael Widenius2011-01-121-2/+0
* | | mergeVladislav Vaintroub2010-12-061-3/+0
|\ \ \ | |/ /
| * | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-3/+0
* | | merge with 5.1Michael Widenius2010-11-301-2/+0
|\ \ \ | |/ /
| * | Fixed compiler and gmake warningsMichael Widenius2010-11-291-2/+0
* | | Merge MariaDB 5.1->5.2unknown2010-11-192-7/+9
|\ \ \ | |/ /
| * | MWL#74: Shared libmysqld.so library.unknown2010-11-172-7/+9
* | | build federared* with libmysqlservicesSergei Golubchik2010-09-121-1/+2
* | | merge with 5.1Sergei Golubchik2010-09-112-15/+9
|\ \ \ | |/ /
| * | build dynamic plugins with the -shared libtool option to avoidSergei Golubchik2010-09-091-3/+2
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-272-13/+8
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-11/+6
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-091-2/+2
* | | merge with 5.1Sergei Golubchik2010-07-252-4/+7
|\ \ \ | |/ /
| * | restore the unintentinally broken ABISergei Golubchik2010-07-232-4/+7
* | | mergeSergei Golubchik2010-06-142-4/+2
|\ \ \ | |/ /
| * | allow federated and innodb_plugin to be builtSergei Golubchik2010-06-092-4/+2
* | | merge 5.1->5.2Sergei Golubchik2010-06-012-87/+130
|\ \ \ | |/ /
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-87/+130
| |\ \ | | |/
| | * Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-6/+6
| | * Fix for bug#32426: "FEDERATED query returns corrupt resultsRamil Kalimullin2010-03-052-84/+127
* | | Maria WL#61unknown2010-04-011-0/+17
|/ /
* | Merge with MySQL 5.1.42Michael Widenius2010-01-151-3/+6
|\ \ | |/
| * Bug#47382 'mysqladmin debug' crash on 64-bit WindowsChristopher Powers2009-11-101-3/+6
* | Added federatedx storage engineMichael Widenius2009-10-302-0/+7
* | Merge MySQL->MariaDBSergey Petrunya2009-09-082-34/+22
|\ \ | |/
| * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-22/+20
| |\
| | * Merge from 5.0-bugteamStaale Smedseng2009-06-171-22/+20
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-12/+2
| |/
| * Bug #39802 On Windows, 32-bit time_t should be enforcedAnurag Shekhar2009-05-131-2/+2
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-12/+12
|\ \ | |/
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-132-12/+12
| * Fix warnings and bug spotted by gcc-4.3.Davi Arnaut2008-12-161-1/+1
* | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1