summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Removed no longer used error message.Vicențiu Ciorbaru2013-10-181-3/+0
| * | | | Reworked the implementation of create role and drop role.Vicențiu Ciorbaru2013-10-181-2/+0
| * | | | Added CREATE ROLE support as well as DROP ROLE support.Vicențiu Ciorbaru2013-10-181-0/+5
| * | | | Added error message for invalid roleVicențiu Ciorbaru2013-10-171-0/+6
* | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-231-0/+2
* | | | | 10.0-base merge.Sergei Golubchik2013-09-211-1/+9
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-4911 - add KILL query id, and add query id information to processlistSergey Vojtovich2013-09-161-0/+4
| * | | | MDEV-26: Global transaction ID.unknown2013-08-231-1/+3
| * | | | MDEV-4820: Empty master does not give error for slave GTID position that does...unknown2013-08-161-0/+2
* | | | | 10.0-monty mergeSergei Golubchik2013-07-211-469/+742
|\ \ \ \ \
| * | | | | clearly mark unused error messages as suchSergei Golubchik2013-07-101-35/+11
| * | | | | Fix test errors like:Sergey Petrunya2013-07-081-23/+4
| * | | | | Fix limit_rows_examined.test:Sergey Petrunya2013-07-051-0/+2
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-462/+759
* | | | | | 10.0-base mergeSergei Golubchik2013-07-1826-145/+149
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.5 mergeSergei Golubchik2013-07-1726-145/+145
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | mysql-5.5.32 mergeSergei Golubchik2013-07-1625-25/+25
| | |\ \ \
| | | * | | Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSINGJon Olav Hauglid2013-05-081-2/+0
| | | | |/ | | | |/|