Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -1/+1 |
| |\ | |||||
| | * | tokudb buildbot fixes | Sergei Golubchik | 2013-09-12 | 1 | -1/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -3/+3 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | MDEV-388 Creating a federated table with a non-existing server returns a rand... | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| | * | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -16/+0 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -16/+0 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 2 | -5/+4 |
|\ \ \ | |/ / | |||||
| * | | fix the failing federated.federated_innodb test: | Sergei Golubchik | 2013-01-23 | 2 | -2/+2 |
| * | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -5/+0 |
| * | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+7 |
* | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+0 |
| * | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -2/+0 |
* | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE | Venkata Sidagam | 2012-07-26 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE | Venkata Sidagam | 2012-07-26 | 1 | -1/+1 |
* | | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -7/+0 |
|/ / / | |||||
* | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 2 | -2/+2 |
* | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+10 |
|\ \ \ | |/ / | |||||
| * | | Auto-merge from mysql-5.1. | Ramil Kalimullin | 2011-12-23 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITING | Ramil Kalimullin | 2011-12-23 | 1 | -1/+2 |
| * | | Auto-merge from mysq-5.1. | Ramil Kalimullin | 2011-12-23 | 1 | -0/+9 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#11758931 - 51196: SLAVE SQL: GOT AN ERROR WRITING | Ramil Kalimullin | 2011-12-23 | 1 | -0/+9 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 2 | -3/+4 |
|\ \ \ | |||||
| * \ \ | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | test both federated and federatedX in the federated suite. | Sergei Golubchik | 2011-11-30 | 1 | -1/+1 |
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 4 | -7/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGIN | Bjorn Munch | 2011-09-05 | 1 | -2/+2 |
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 4 | -6/+9 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | rename debug variable to debug_dbug, to make test pass in release builds | Sergei Golubchik | 2011-12-15 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 2 | -5/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -4/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -6/+9 |
* | | | | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -1/+12 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 2 | -4/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with 5.1 | Michael Widenius | 2011-01-12 | 1 | -2/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix for LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX' failed wit... | Michael Widenius | 2011-01-12 | 1 | -2/+0 |
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / |