summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-209/+252
|\
| * WL#2360 Performance schemaMarc Alff2010-01-061-209/+252
* | Manual merge from next-mr.unknown2010-01-121-21/+4
|\ \ | |/
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-21/+4
* | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-10/+10
|\ \ | |/ |/|
| * merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-10/+10
| |\
| | * mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-32/+59
| | |\
| | * \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-2/+1
| | |\ \
| | * | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-1/+1
| | * | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-9/+9
| | |\ \ \
| | | * \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-1/+1
| | | |\ \ \
| | | | * | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-1/+1
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#49119: Master crashes when executing 'REVOKE ... ON Luis Soares2009-12-061-1/+1
| | |/ / / / / /
* | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-14/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-103/+225
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | mergeGeorgi Kodinov2009-11-271-5/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #48872 : Privileges for stored functions ignored if function nameGeorgi Kodinov2009-11-271-5/+8
| | * | | | | | | automergeSergey Glukhov2009-10-271-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | An addition to fix forSergey Vojtovich2009-10-271-2/+2
| * | | | | | | | | auto-mergeTatiana A. Nurnberg2009-11-241-0/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#48319: Server crashes on "GRANT/REVOKE ... TO CURRENT_USER"Tatiana A. Nurnberg2009-10-291-0/+7
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Bug#41726: upgrade from 5.0 to 5.1.30 crashes if you didn't run mysql_upgradeDavi Arnaut2009-11-211-3/+4
| * | | | | | | | | mergeKristofer Pettersson2009-11-201-6/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-6/+16
* | | | | | | | | | Bug#35589 SET PASSWORD caused a crashMagne Mahre2009-12-081-1/+1
* | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-11/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-11/+70
* | | | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-50/+51
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Backport of:Konstantin Osipov2009-11-241-50/+51
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Auto mergeHe Zhenxing2009-11-211-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-2/+0
| |/ / / / / / / / /
* | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-11/+14
|/ / / / / / / / /
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-25/+52
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-271-19/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-271-19/+24
| | |/ / / / /
| * | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-10-201-12/+34
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix for Bug #41597 - After rename of user, there are additional grants when Satya B2009-10-201-12/+34
| | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-7/+3
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-7/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-7/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+1
|\ \ \ \ \ \
| * | | | | | Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"Sergey Glukhov2009-10-231-0/+1
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-2/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-2/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#35996: SELECT + SHOW VIEW should be enough to displayMartin Hansson2009-09-281-2/+1
| | | |/ / / | | |/| | |
| | * | | | reverted the fix for bug #46019 from 5.1-bugteamGeorgi Kodinov2009-08-211-7/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Revert of the fix for bug #46019.Georgi Kodinov2009-08-211-8/+4
| | * | | | merge of bug #46019 to 5.1-bugteamGeorgi Kodinov2009-08-201-2/+7
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
View Lorry Controller Status