Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-6109: EXPLAIN JSON10.1-explain-json | Sergei Petrunia | 2014-05-27 | 1 | -0/+1 |
* | Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -0/+1 |
* | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -0/+3 |
|\ | |||||
| * | New syntax: | Sergei Golubchik | 2013-10-18 | 1 | -0/+1 |
| * | Implemented SHOW GRANTS functionality | Vicențiu Ciorbaru | 2013-10-18 | 1 | -0/+1 |
| * | Added the SET ROLE command to the grammar | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+1 |
* | | MDEV-5163 Merge WEIGHT_STRING function from MySQL-5.6 | Alexander Barkov | 2013-10-23 | 1 | -0/+2 |
* | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | MDEV-4911 - add KILL query id, and add query id information to processlist | Sergey Vojtovich | 2013-09-13 | 1 | -0/+1 |
| * | Merge | Igor Babaev | 2013-08-06 | 1 | -0/+1 |
| |\ | |||||
| | * | MWL#205 DELETE with result set (mdev-3814) | Igor Babaev | 2013-08-06 | 1 | -0/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -0/+3 |
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -0/+7 |
* | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -1/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | MDEV-26: Global transaction ID. | unknown | 2013-05-22 | 1 | -0/+2 |
| * | | | MDEV-26: Global transaction ID. | unknown | 2013-05-15 | 1 | -1/+2 |
* | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | MDEV-26: Global transaction ID. | unknown | 2013-04-05 | 1 | -1/+1 |
| * | | MDEV-26. Intermediate commit. | unknown | 2013-01-22 | 1 | -0/+2 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | pre-merge | unknown | 2012-12-23 | 1 | -2/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | backport to 5.5 dyncol changes and names support | unknown | 2012-12-23 | 1 | -3/+0 |
| | * | MDEV-377 Name support for dynamic columns | unknown | 2012-09-28 | 1 | -0/+2 |
* | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -0/+1 |
| * | | Added function last_value() which returns the last value but evalutes all arg... | Michael Widenius | 2012-09-05 | 1 | -0/+1 |
| |/ | |||||
* | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -1/+0 |
* | | SQL syntax extended with START TRANSACTION READ ONLY|READ WRITE | Alexey Botchkov | 2012-08-25 | 1 | -0/+1 |
* | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+2 |
|/ | |||||
* | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. | unknown | 2012-03-12 | 1 | -0/+1 |
|\ | |||||
| * | Implementation of MDEV-28 LIMIT ROWS EXAMINED | unknown | 2012-03-11 | 1 | -0/+1 |
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+5 |
| | | |\ | |||||
* | | | \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -0/+2 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -0/+13 |
| | | |\ \ \ \ | |||||
* | | | \ \ \ \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+6 |
| * | | | | | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don... | Michael Widenius | 2011-04-28 | 1 | -0/+1 |
| * | | | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -0/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -2/+3 |
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+1 |
| * | | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -2/+7 |
| |\ \ \ \ \ |