summaryrefslogtreecommitdiff
path: root/storage/federated
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-192-4/+0
|\
| * 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
* | | less boilerplate code - move common operations to wrappersSergei Golubchik2011-07-141-16/+0
* | | post-merge fixes.Sergei Golubchik2011-07-021-15/+7
* | | 5.5-mergeSergei Golubchik2011-07-024-90/+13
|\ \ \
| * | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-1/+2
| * | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-91/+0
| * | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-062-0/+11
* | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+1
* | | | merge.Sergei Golubchik2010-11-255-10/+35
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
| | |\
| * | \ 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
| | |\ \
| * | | | Maria WL#61unknown2010-04-011-0/+17
| |/ / /
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-3/+6
| |\ \ \
| * | | | Added federatedx storage engineMichael Widenius2009-10-302-0/+7
| * | | | Merge MySQL->MariaDBSergey Petrunya2009-09-082-34/+22
| |\ \ \ \
| * \ \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-252-12/+12
| |\ \ \ \ \
| * | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1
| * | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-292-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-292-3/+3
* | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
* | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-5/+5
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-092-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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | | | | | | | Patch for 47759 to trunk-bugfixing.Horst.Hunger2010-05-051-5/+21
* | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+5
* | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-243-16/+51
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-191-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-1/+1
| * | | | | | | | | mergeVladislav Vaintroub2009-12-102-14/+43
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-042-14/+43
| * | | | | | | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-1/+1