summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-363/+1880
|\
| * merge with 5.1Sergei Golubchik2010-09-111-12/+23
| |\
| | * 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
| | |\
| * | | old_password_plugin is used even in embedded buildsSergei Golubchik2010-07-231-1/+1
| * | | Fixed compiler and valgrind warningsMichael Widenius2010-07-191-0/+2
| * | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-4/+12
| * | | handle a case when a user connects with a password to a passwordless accountSergei Golubchik2010-06-021-2/+4
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-5/+5
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-5/+5
| | |\ \
| | * | | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-281-0/+2
| * | | | crash on --with-embedded-privilege-control builds:Sergei Golubchik2010-05-141-9/+28
| * | | | don't hide old_password_plugin from embedded, it may be compiled with grant s...Sergei Golubchik2010-04-141-2/+0
| * | | | keep acl_user->auth_string and acl_user->salt always in syncSergei Golubchik2010-04-061-14/+35
| * | | | fixed a bug in handling mysql_native_password specified explicitly:Sergei Golubchik2010-04-051-20/+42
| * | | | embedded builds used to refer to undefined functions inside if(0) { }Sergei Golubchik2010-04-021-0/+1
| * | | | Maria WL#61unknown2010-04-011-0/+32
| * | | | Merge with 5.1Michael Widenius2010-04-011-8/+11
| |\ \ \ \ | | |/ / /
| * | | | Fixed some compiler warningsMichael Widenius2010-03-311-1/+4
| * | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-296/+1697
| * | | | mergedSergei Golubchik2010-03-151-19/+93
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-19/+93
| | |\ \ \
| * | \ \ \ merge 5.1->5.2unknown2010-02-011-14/+35
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-14/+35
| | |\ \ \ \
| * | \ \ \ \ merge 5.1-> 5.2unknown2009-12-081-34/+60
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-34/+60
| | |\ \ \ \ \
| * | | | | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-33/+36
| |/ / / / / /
| * | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-53/+67
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-36/+87
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-17/+16
| * | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-27/+42
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-36/+115
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-2/+0
* | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-2/+0
* | | | | | | | | | | | Fix a failing assert when running funcs_1.innodb_trig_03 test.Konstantin Osipov2010-07-281-1/+1
* | | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-25/+21
* | | | | | | | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-191-12/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-091-6/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-6/+4
| * | | | | | | | | | | Manul mergeunknown2010-07-041-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | The following statements support the CURRENT_USER() where a user is needed.unknown2010-07-041-6/+17
| * | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-281-17/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-281-17/+6
| * | | | | | | | | | | Manual mergeunknown2010-06-271-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | The following statements support the CURRENT_USER() where a user is needed.unknown2010-06-271-6/+17
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATEJon Olav Hauglid2010-07-011-52/+45
|/ / / / / / / / / /
* | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-5/+5
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /