summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3.4 mergeSergei Golubchik2012-02-151-14/+23
|\
| * mergeVladislav Vaintroub2012-02-111-14/+20
| |\
| | * Fix for MDEV-140, LPBug#930145 - broken SSL connectivity for some connectorsVladislav Vaintroub2012-02-111-14/+20
| | |\
* | | \ 5.3 mergeSergei Golubchik2012-01-131-4/+14
|\ \ \ \ | |/ / /
| * | | Merge with 5.2.Michael Widenius2011-12-111-8/+16
| |\ \ \ | | |/ /
| | * | Merge with MariaDB 5.1Michael Widenius2011-11-241-7/+15
| | |\ \ | | | |/
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+2
| | | |\
* | | | \ 5.3->5.5 mergeSergei Golubchik2011-11-221-45/+18
|\ \ \ \ \ | |/ / / /
| * | | | Allow one to block an account by using GRANT max_user_connections = -1Michael Widenius2011-09-261-11/+18
* | | | | mergeSergei Golubchik2011-11-031-3/+3
|\ \ \ \ \
| * | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-3/+3
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-9/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug #12944747: MYSQL PROXY CAN'T DISTINGUISH WIN-AUTH DATA Georgi Kodinov2011-09-071-17/+6
| * | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-2/+4
| * | | | | re-commit of bug #12818542: PAM: ADDING PASSWORD FOR AN ACCOUNT DISABLES Georgi Kodinov2011-08-121-5/+5
| * | | | | Merge from mysql-5.5.14-releaseunknown2011-07-061-9/+7
| |\ \ \ \ \
| | * \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-061-35/+109
| | |\ \ \ \ \
| | * | | | | | BUG 12610784: SET PASSWORD INCORRECTLY KEEP AN OLD EMPTY PASSWORDGeorgi Kodinov2011-06-011-9/+7
| * | | | | | | Bug #11766641: 59792: BIN/MYSQL -UUNKNOWN -PUNKNOWN Georgi Kodinov2011-05-161-1/+9
| | |/ / / / / | |/| | | | |
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-42/+45
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Automatic merge with 5.2Michael Widenius2011-08-161-7/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fixed build failure in embedded library regarding that decrease_user_connecti...Michael Widenius2011-08-161-1/+0
| | * | | | | Fixed bug that MAX_USER_CONNECTIONS was not working properly in all situation...Michael Widenius2011-08-161-6/+3
| * | | | | | Merge from 5.2unknown2011-07-211-14/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | protocol safety fix:Sergei Golubchik2011-07-081-14/+7
| * | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-2/+1
| * | | | | | MergeIgor Babaev2011-05-201-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-1/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-1/+2
| | | |\ \ \ \ \
| | | | * | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-1/+2
| * | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-49/+92
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-46/+86
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | bug#683112 Maria 5.2 incorrectly reports "(using password: NO)" even when pas...Sergei Golubchik2010-12-201-7/+10
| * | | | | | | | merge with 5.1Michael Widenius2010-11-301-1/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-1/+16
| | |\ \ \ \ \ \ \
* | | | | | | | | | compilation fixes: without dbug, without sslSergei Golubchik2011-07-161-1/+1
* | | | | | | | | | post-merge fixes.Sergei Golubchik2011-07-021-69/+58
* | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-320/+1107
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge of mysql-5.1 into mysql-5.5.Davi Arnaut2011-05-301-25/+99
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | auto-merge Bug#11745920Tatjana Azundris Nuernberg2011-05-261-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#11745920/Bug#21287: "SSL connection error" is not helpful! (ssl-verify-se...Tatjana Azundris Nuernberg2011-05-191-2/+2
| * | | | | | | | | | Merge from 5.1.Guilhem Bichot2011-05-211-8/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-3/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | A patch for Bug#12429877: QUERY_TABLES_LIST::SROUTINES IS NOTAlexander Nozdrin2011-05-161-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-211-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Bug # 11766011: mysql.user.authentication_string column causes Georgi Kodinov2011-03-181-0/+2
| * | | | | | | | Fixed a post-merge embedded compilation errorGeorgi Kodinov2011-03-171-0/+2
| * | | | | | | | Certain fields in the protcol required a strict formatting. IfKristofer Pettersson2011-03-141-32/+144
| |/ / / / / / /
| * | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-091-42/+84
| |\ \ \ \ \ \ \ | | |/ / / / / /
View Lorry Controller Status