summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merged fix for bug #36544 "DROP USER does not remove storedDmitry Lenev2011-02-071-42/+82
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix for bug#36544 "DROP USER does not remove stored function Dmitry Lenev2011-02-071-42/+82
| * | | | | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they...Alexander Barkov2011-02-181-4/+4
| * | | | | | | Bug #59453: Non-ASCIIZ string kills protocol extensibility in MySQL 5.5Georgi Kodinov2011-01-141-1/+1
| * | | | | | | Bug #58119: Typo in warning on log: [Warning] 'proxes_priv' entryGeorgi Kodinov2010-11-191-1/+1
| * | | | | | | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rcGeorgi Kodinov2010-11-191-24/+41
| * | | | | | | Fix a debug assertion caused by a missing DBUG_RETURN macro.Davi Arnaut2010-11-171-3/+3
| * | | | | | | Bug #57916: Fix the naming of the proxy_priv tableGeorgi Kodinov2010-11-021-37/+48
| * | | | | | | Bug #57689: mysql_change_user() breaks user connection on older clientsGeorgi Kodinov2010-10-251-2/+37
| * | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-1/+1
| | * | | | | | BUG#57098 RBR breaks on changing user password on 5.1 master -> 5.5 slaveAlfranio Correia2010-10-061-0/+15
| * | | | | | | Fix compilation warnings.Alexander Nozdrin2010-10-121-1/+1
| * | | | | | | mergeGeorgi Kodinov2010-10-041-34/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Polish check_grant(): name TABLE_LIST instance "tl", not "table".Alexander Nozdrin2010-08-311-34/+36
| * | | | | | | | WL#1054: code style remarks fixed.Georgi Kodinov2010-09-201-301/+308
| * | | | | | | | Bug #56798 : Wrong credentials assigned when using a proxy user.Georgi Kodinov2010-09-201-24/+62
| * | | | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-318/+2530
| |/ / / / / / /
* | | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-8/+11
View Lorry Controller Status