Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 9 | -9/+11 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 9 | -9/+11 |
| |\ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 9 | -9/+11 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 9 | -9/+11 |
| | | * | Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSING | Jon Olav Hauglid | 2013-05-08 | 1 | -2/+0 |
* | | | | Merge 10.0-base -> 10.0 | unknown | 2014-02-11 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4937: sql_slave_skip_counter does not work with GTID | unknown | 2014-02-11 | 1 | -0/+2 |
* | | | | Merge MariaDB 10.0-base to 10.0. | unknown | 2014-02-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base. | unknown | 2014-02-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. | unknown | 2014-02-07 | 1 | -1/+1 |
* | | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -7/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes for CREATE_OR_REPLACE | Michael Widenius | 2014-01-31 | 1 | -7/+5 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -36/+14 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -35/+12 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | remove an unused error message | Sergei Golubchik | 2014-01-21 | 1 | -25/+2 |
| | * | | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -10/+10 |
* | | | | | Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -0/+6 |
* | | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 1 | -0/+8 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -23/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -24/+24 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5022 Strange message or wrong errno on mismatching versions of plugin an... | Sergei Golubchik | 2013-11-11 | 1 | -24/+24 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | MDEV-4506: Parallel replication: error handling. | unknown | 2013-10-14 | 1 | -0/+2 |
| | * | | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate... | unknown | 2013-06-24 | 1 | -0/+2 |
* | | | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -4/+15 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Don't allow authentication clauses for roles, in particular: | Sergei Golubchik | 2013-10-28 | 1 | -2/+2 |
| * | | | | remove ER_RESERVED_ROLE. | Sergei Golubchik | 2013-10-18 | 1 | -6/+3 |
| * | | | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -3/+2 |
| * | | | | Fixed GRANT ROLE TO ROLE not updating acl_roles_mappings hash. | Vicențiu Ciorbaru | 2013-10-18 | 1 | -0/+3 |
| * | | | | Added GRANT ROLE TO ROLE | USER functionality. | Vicențiu Ciorbaru | 2013-10-18 | 1 | -0/+6 |
| * | | | | Removed no longer used error message. | Vicențiu Ciorbaru | 2013-10-18 | 1 | -3/+0 |
| * | | | | Reworked the implementation of create role and drop role. | Vicențiu Ciorbaru | 2013-10-18 | 1 | -2/+0 |
| * | | | | Added CREATE ROLE support as well as DROP ROLE support. | Vicențiu Ciorbaru | 2013-10-18 | 1 | -0/+5 |
| * | | | | Added error message for invalid role | Vicențiu Ciorbaru | 2013-10-17 | 1 | -0/+6 |
* | | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -0/+2 |
* | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-4911 - add KILL query id, and add query id information to processlist | Sergey Vojtovich | 2013-09-16 | 1 | -0/+4 |
| * | | | | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -1/+3 |
| * | | | | MDEV-4820: Empty master does not give error for slave GTID position that does... | unknown | 2013-08-16 | 1 | -0/+2 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -469/+742 |
|\ \ \ \ \ | |||||
| * | | | | | clearly mark unused error messages as such | Sergei Golubchik | 2013-07-10 | 1 | -35/+11 |
| * | | | | | Fix test errors like: | Sergey Petrunya | 2013-07-08 | 1 | -23/+4 |
| * | | | | | Fix limit_rows_examined.test: | Sergey Petrunya | 2013-07-05 | 1 | -0/+2 |
| * | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -462/+759 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 26 | -145/+149 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 26 | -145/+145 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 25 | -25/+25 |
| | |\ \ \ | |||||
| | | * | | | Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSING | Jon Olav Hauglid | 2013-05-08 | 1 | -2/+0 |
| | | | |/ | | | |/| |