summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-101-0/+18
* BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-091-34/+52
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-112/+12
|\
| * 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
| |\ \ | | |/
| * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-11/+14
| |\ \
* | \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-12/+112
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;2010-01-301-12/+112
| | |/ | |/|
| * | Manual merge with Conflicts:2010-01-251-11/+14
| |\ \
| | * | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-11/+14
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-301-0/+66
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-trunk-merge.Alexander Nozdrin2010-01-191-5/+10
|\ \ \ | |/ /
| * | 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 from mysql-next-mr.Alexander Nozdrin2010-01-181-240/+266
|\ \ \
| * \ \ 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.2010-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
* | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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 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