Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-12-20 | 1 | -23/+23 |
|\ | |||||
| * | MDEV-14639: Fix unexpected end of line at 'Normal shutdown' | Simon J Mudd | 2017-12-19 | 1 | -22/+22 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-03-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-12126 Correct German error message. | Vladislav Vaintroub | 2017-03-17 | 1 | -1/+1 |
* | | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT | Sergei Golubchik | 2016-12-04 | 1 | -1/+1 |
* | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | Fix error handling for GTID and domain-based parallel replication | Kristian Nielsen | 2016-01-15 | 1 | -1/+1 |
* | | MDEV-7652 - More explanatory ERROR and WARNING messages when loading plugins | Sergey Vojtovich | 2015-07-29 | 1 | -0/+3 |
* | | MDEV-7785: errorneous -> erroneous spelling mistake | Kristian Nielsen | 2015-03-16 | 1 | -1/+1 |
* | | two more unused error messages | Sergei Golubchik | 2014-11-18 | 1 | -4/+4 |
* | | MDEV-6224 Incorrect information in file when *.frm is > 256K | Sergei Golubchik | 2014-07-08 | 1 | -0/+2 |
* | | cleanup, unused error mesages | Sergei Golubchik | 2014-07-08 | 1 | -14/+13 |
* | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | 2 typo fixed | unknown | 2014-05-27 | 1 | -2/+2 |
* | | for windows | Sergei Golubchik | 2014-05-09 | 1 | -0/+43 |
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 23 | -0/+23 |
|\ \ | |/ | |||||
| * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 23 | -0/+23 |
| |\ | |||||
| | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 23 | -0/+23 |
* | | | 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 |