summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-12-201-23/+23
|\
| * MDEV-14639: Fix unexpected end of line at 'Normal shutdown'Simon J Mudd2017-12-191-22/+22
* | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-211-1/+1
|\ \ | |/
| * MDEV-12126 Correct German error message.Vladislav Vaintroub2017-03-171-1/+1
* | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECTSergei Golubchik2016-12-041-1/+1
* | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | Fix error handling for GTID and domain-based parallel replicationKristian Nielsen2016-01-151-1/+1
* | MDEV-7652 - More explanatory ERROR and WARNING messages when loading pluginsSergey Vojtovich2015-07-291-0/+3
* | MDEV-7785: errorneous -> erroneous spelling mistakeKristian Nielsen2015-03-161-1/+1
* | two more unused error messagesSergei Golubchik2014-11-181-4/+4
* | MDEV-6224 Incorrect information in file when *.frm is > 256KSergei Golubchik2014-07-081-0/+2
* | cleanup, unused error mesagesSergei Golubchik2014-07-081-14/+13
* | 5.5.38 mergeSergei Golubchik2014-06-061-2/+2
|\ \ | |/
| * 2 typo fixedunknown2014-05-271-2/+2
* | for windowsSergei Golubchik2014-05-091-0/+43
* | 5.5 mergeSergei Golubchik2014-05-0923-0/+23
|\ \ | |/
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-2723-0/+23
| |\
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-1723-0/+23
* | | 10.0-base mergeSergei Golubchik2014-02-269-9/+11
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-259-9/+11
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-179-9/+11
| | |\ \ | | | |/
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-069-9/+11
| | | * Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSINGJon Olav Hauglid2013-05-081-2/+0
* | | | Merge 10.0-base -> 10.0unknown2014-02-111-0/+2
|\ \ \ \ | |/ / /
| * | | MDEV-4937: sql_slave_skip_counter does not work with GTIDunknown2014-02-111-0/+2
* | | | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-1/+1
|\ \ \ \ | |/ / /
| * | | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-1/+1
| |\ \ \
| | * | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-1/+1
* | | | | Automatic mergeMichael Widenius2014-02-051-7/+5
|\ \ \ \ \
| * | | | | Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-311-7/+5
* | | | | | 10.0-base mergeSergei Golubchik2014-02-031-36/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.5 mergeSergei Golubchik2014-02-011-35/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | remove an unused error messageSergei Golubchik2014-01-211-25/+2
| | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-10/+10
* | | | | Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-1/+1
| |_|/ / |/| | |
* | | | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-0/+6
* | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-281-0/+8
* | | | 10.0-base mergeSergei Golubchik2013-11-131-23/+23
|\ \ \ \ | |/ / /
| * | | 5.5. mergeSergei Golubchik2013-11-131-24/+24
| |\ \ \ | | |/ /
| | * | MDEV-5022 Strange message or wrong errno on mismatching versions of plugin an...Sergei Golubchik2013-11-111-24/+24
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-0/+4
|\ \ \ \ | |/ / /
| * | | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-0/+4
| |\ \ \
| | * | | MDEV-4506: Parallel replication: error handling.unknown2013-10-141-0/+2
| | * | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate...unknown2013-06-241-0/+2
* | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-4/+15
|\ \ \ \ \ | |/ / / /
| * | | | Don't allow authentication clauses for roles, in particular:Sergei Golubchik2013-10-281-2/+2
| * | | | remove ER_RESERVED_ROLE.Sergei Golubchik2013-10-181-6/+3
| * | | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-3/+2
| * | | | Fixed GRANT ROLE TO ROLE not updating acl_roles_mappings hash.Vicențiu Ciorbaru2013-10-181-0/+3
| * | | | Added GRANT ROLE TO ROLE | USER functionality.Vicențiu Ciorbaru2013-10-181-0/+6