summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-1/+2
|\
| * Use after free in authenticationmariadb-galera-5.5.60Sergei Golubchik2018-05-011-0/+1
| * Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-1/+1
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-1/+1
| | |\
| | | * BUG#26881798: SERVER EXITS WHEN PRIMARY KEY IN MYSQL.PROCKarthik Kamath2017-12-051-1/+3
| | | * (no commit message)Arun Kuruvila2016-11-281-1/+500
| | | * Bug#23303391: HANDLE_FATAL_SIGNAL (SIG=11) IN ALLOC_QUERYArun Kuruvila2016-08-291-2/+8
| * | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-2/+2
| |\ \ \ | | |/ /
| * | | Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-14/+21
| |\ \ \
| * \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-0/+4
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-20/+23
| |\ \ \ \ \
| * \ \ \ \ \ bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-1/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ mariadb-5.5.33 mergeSergei Golubchik2013-09-181-27/+22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-15/+35
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-68/+172
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ References: lp:1066784 - Merged with MariaDB 5.5.28aSeppo Jaakola2012-11-301-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | References lp:1066784Seppo Jaakola2012-10-231-1/+37
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-21/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Follow up to MDEV-12366: FLUSH privileges can break hierarchy of rolesVicențiu Ciorbaru2017-12-211-15/+11
| * | | | | | | | | | | | | | | MDEV-12366: FLUSH PRIVILEGES can break hierarchy of rolesVicențiu Ciorbaru2017-12-191-12/+18
| * | | | | | | | | | | | | | | MDEV-13655: Set role does not properly grant privileges.Vicențiu Ciorbaru2017-12-191-15/+32
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fix check_role_is_granted for embeddedVicențiu Ciorbaru2017-10-171-35/+39
| * | | | | | | | | | | | | | | MDEV-13676: Field "create Procedure" is NULL, even if the the user has role w...Vicențiu Ciorbaru2017-10-111-0/+46
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warningSergei Golubchik2017-05-151-6/+0
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | MDEV-5999 MySQL Bug#12766319 - 61865: RENAME USER DOES NOT WORK CORRECTLY - R...Sergei Golubchik2017-02-271-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | MDEV-10744: Roles are not fully case sensitiveVicențiu Ciorbaru2016-12-011-1/+1
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-241-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | [MDEV-9614] Roles and Users longer than 6 charactersIgor Pashev2016-06-221-7/+5
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-36/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-21/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | (no commit message)Arun Kuruvila2016-02-231-8/+8
| | * | | | | | | | | | | | | MDEV-9835 Valid password is not working after server restartSergei Golubchik2016-04-191-5/+12
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | MDEV-9580 SHOW GRANTS FOR <current_user> failsSergei Golubchik2016-04-241-13/+13
| * | | | | | | | | | | | | SEGFAULT in get_column_grant()Igor Pashev2016-04-211-1/+2
| * | | | | | | | | | | | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-4/+0
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2015-12-091-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Bug #21602056 : CONCURRENT FLUSH PRIVILEGES + REVOKE/GRANTArun Kuruvila2015-10-141-0/+8