summaryrefslogtreecommitdiff
path: root/storage/federated
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base merge.Sergei Golubchik2013-09-211-1/+1
|\
| * 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-1/+1
| |\
| | * tokudb buildbot fixesSergei Golubchik2013-09-121-1/+1
* | | 10.0-monty mergeSergei Golubchik2013-07-211-3/+3
|\ \ \
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-3/+3
* | | | 10.0-base mergeSergei Golubchik2013-06-061-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | 5.5 mergeSergei Golubchik2013-06-061-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-388 Creating a federated table with a non-existing server returns a rand...Sergei Golubchik2013-05-201-1/+1
| | * | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-1/+1
* | | | 10.0-base mergeSergei Golubchik2013-04-152-16/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-16/+0
* | | 10.0-base mergeSergei Golubchik2013-01-312-5/+4
|\ \ \ | |/ /
| * | fix the failing federated.federated_innodb test:Sergei Golubchik2013-01-232-2/+2
| * | 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 10.0-base to MariaDB 10.0unknown2012-12-181-2/+0
|\ \ \ | |/ /
| * | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-2/+0
| * | 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-152-2/+2
* | | 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-132-3/+4
|\ \ \
| * \ \ 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
| | |\ \ \ | | | |/ /
* | | | | 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-032-5/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | Updated/added copyright headersKent Boortz2011-06-302-4/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-304-6/+9
* | | | | fixes for windowsSergei Golubchik2011-10-211-1/+12
* | | | | 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
| |\ \ \ \ | | |/ / /