summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1.53Michael Widenius2010-11-251-1/+16
|\
| * 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 that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-4/+4
* | Merge with MySQL 5.1.50Michael Widenius2010-08-271-6/+17
|\ \ | |/
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-2/+0
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-6/+4
| * The following statements support the CURRENT_USER() where a user is needed.unknown2010-07-041-6/+17
| * Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-281-17/+6
| * The following statements support the CURRENT_USER() where a user is needed.unknown2010-06-271-6/+17
* | Merge with MySQL 5.1.47Michael Widenius2010-05-261-5/+5
|\ \ | |/
| * BUG#51987: revoke privileges logs wrong error codeLuis Soares2010-03-221-5/+5
* | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-281-0/+2
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-19/+93
|\ \
| * | Revert a patch for Bug#48231, which introduced valgrind warnings.Alexander Nozdrin2010-02-021-112/+12
| * | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;unknown2010-01-301-12/+112
| |/
| * Manual merge with Conflicts:unknown2010-01-251-11/+14
| |\
| | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-11/+14
| * | Bug #49132 Replication failure on temporary table + DDLunknown2010-01-221-0/+66
| |/
| * Bug#33982 debug assertion and crash reloading grant tables after sighup or killKristofer Pettersson2010-01-131-5/+10
| * Manual merge.Davi Arnaut2009-12-181-2/+2
| |\
| | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-2/+2
| * | Backport to 5.1 branch (next-mr revid: 2921)Magne Mahre2009-12-181-1/+1
| * | BUG#49119: Master crashes when executing 'REVOKE ... ON Luis Soares2009-12-061-1/+1
* | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-14/+35
|\ \ \ | |/ /
| * | 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
* | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-34/+60
|\ \ \ \ \ | |/ / / /
| * | | | 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
| * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-7/+7
| * | 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
| |\ \ | | |/
| | * Bug #46019: ERROR 1356 When selecting from within anotherGeorgi Kodinov2009-08-191-4/+8
| | * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-4/+4
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-53/+67
|\ \ \ | |/ /
| * | Bug#44834 strxnmov is expected to behave as you'd expectSergey Glukhov2009-06-191-2/+2
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-23/+20
| |\ \ \ | | | |/
View Lorry Controller Status