summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-112/+12
|\
| * Revert a patch for Bug#48231, which introduced valgrind warnings.Alexander Nozdrin2010-02-021-112/+12
* | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-12/+112
|\ \ | |/
| * Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;2010-01-301-12/+112
* | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-11/+14
|\ \ | |/
| * Manual merge with Conflicts:2010-01-251-11/+14
| |\
| | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-11/+14
* | | Auto-merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-0/+66
|\ \ \ | |/ /
| * | Bug #49132 Replication failure on temporary table + DDL2010-01-221-0/+66
| |/
* | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-5/+10
|\ \ | |/
| * Bug#33982 debug assertion and crash reloading grant tables after sighup or killKristofer Pettersson2010-01-131-5/+10
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-3/+3
|\ \ | |/
| * 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
* | | 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.Alexander Nozdrin2009-12-111-103/+225
|\ \ \ | |/ / |/| |
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-25/+52
| |\ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-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
| | |\ \ \ \
| * | \ \ \ \ Merge with next-mr-runtime.Konstantin Osipov2009-10-221-28/+137
| |\ \ \ \ \ \
| | * \ \ \ \ \ AutomergeKristofer Pettersson2009-10-191-63/+67
| | |\ \ \ \ \ \
| | * | | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-28/+137
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Backport of:Konstantin Osipov2009-10-141-61/+65
| * | | | | | A backporting patch for WL#4300 (Define privileges for tablespaces).Alexander Nozdrin2009-10-101-2/+2
| |/ / / / /
| * | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-9/+17
* | | | | | 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
* | | | | | | 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
|\ \ \ | |/ / | | / | |/ |/|