summaryrefslogtreecommitdiff
path: root/storage/federated/ha_federated.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-04-151-15/+0
|\
| * * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-15/+0
* | 10.0-base mergeSergei Golubchik2013-01-311-4/+3
|\ \ | |/
| * fix the failing federated.federated_innodb test:Sergei Golubchik2013-01-231-1/+1
| * cleanup:Sergei Golubchik2013-01-231-5/+0
| * cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-2/+2
| * MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-3/+7
| * Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-1/+1
| |\
| * | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-2/+0
* | | merge with 5.5Sergei Golubchik2012-11-031-1/+1
|\ \ \ | | |/ | |/|
| * | mysql-5.5.28Sergei Golubchik2012-10-161-1/+1
| |\ \ | | |/ | |/|
| | * Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-261-1/+1
| | |\
| | | * Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-261-1/+1
* | | | Added support of thd->tx_read_onlyMichael Widenius2012-08-071-7/+0
|/ / /
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-1/+1
|\ \ \ | |/ /
| * | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2012-02-151-1/+1
* | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+10
|\ \ \ | |/ /
| * | Auto-merge from mysql-5.1.Ramil Kalimullin2011-12-231-1/+2
| |\ \ | | |/
| | * Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITINGRamil Kalimullin2011-12-231-1/+2
| * | Auto-merge from mysq-5.1.Ramil Kalimullin2011-12-231-0/+9
| |\ \ | | |/
| | * Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITING Ramil Kalimullin2011-12-231-0/+9
* | | 5.3 mergeSergei Golubchik2012-01-131-2/+2
|\ \ \
| * \ \ 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-241-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+2
| | |\ \ \ | | | | |/ | | | |/|
* | | | | rename debug variable to debug_dbug, to make test pass in release buildsSergei Golubchik2011-12-151-1/+1
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-3/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
* | | | | fixes for windowsSergei Golubchik2011-10-211-1/+12
* | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+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
* | | | | 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-021-0/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-0/+10
* | | | | merge.Sergei Golubchik2010-11-251-1/+21
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge with 5.1Sergei Golubchik2010-09-111-11/+6
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-11/+6
| | |\ \ | | | |/
| * | | merge with 5.1Sergei Golubchik2010-07-251-2/+5
| |\ \ \ | | |/ /
| | * | restore the unintentinally broken ABISergei Golubchik2010-07-231-2/+5
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-87/+121
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-87/+121
| | |\ \
| * | | | Maria WL#61unknown2010-04-011-0/+17
| |/ / /
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-22/+20
| |\ \ \
| * \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-251-10/+10
| |\ \ \ \