summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* String::set(double) and set(longlong) -> set_real() and set_int()serg@serg.mylan2006-06-161-1/+1
* Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-55/+63
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-06-041-27/+45
|\
| * This changeset is largely a handler cleanup changeset (WL#3281), but includes...monty@mysql.com2006-06-041-27/+45
* | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-301-5/+12
|\ \
| * \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-261-5/+10
| |\ \
| | * \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-261-5/+10
| | |\ \
| | | * | BUG#18681: View privileges are brokengkodinov@mysql.com2006-05-261-5/+10
| * | | | Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW failgkodinov@mysql.com2006-05-261-0/+2
| |/ / /
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-05-191-2/+3
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-05-151-2/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix possible race. Use LOCK_grant on access to grant_version.kroki@mysql.com2006-05-151-2/+3
* | | | Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-05-121-2/+2
|\ \ \ \
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_mergemsvensson@neptunus.(none)2006-05-121-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-05-091-2/+2
| | |\ \ \
| | | * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-121-2/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-2/+2
* | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-newtnurnberg@mysql.com2006-05-111-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug#19509: Redundant check in sql_acl.cctnurnberg@mysql.com2006-05-081-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge mysql.com:/home/tomash/src/mysql_ab/tmp_mergekroki@mysql.com2006-05-111-47/+61
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)kroki@mysql.com2006-05-061-47/+61
| |/ /
* | | Fixed compiler and valgrind warningsmonty@mysql.com2006-03-291-2/+3
* | | 5.0 -> 5.1 mergegluh@mysql.com2006-03-211-0/+7
|\ \ \ | |/ /
| * | Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"gluh@eagle.intranet.mysql.r18.ru2006-03-201-0/+7
* | | Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-03-071-10/+0
|\ \ \
| * \ \ Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-03-031-10/+0
| |\ \ \
| | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.1-releasemats@mysql.com2006-02-241-10/+0
| | |\ \ \
| | | * \ \ Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-02-161-10/+0
| | | |\ \ \
| | | | * | | WL#3023 (Use locks in a statement-like manner):mats@mysql.com2006-02-161-10/+0
* | | | | | | Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0pem@mysql.com2006-03-061-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | 4.1 -> 5.0 mergegluh@mysql.com2006-03-061-1/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix for bug#14385 GRANT and mapping to correct user account problemsgluh@eagle.intranet.mysql.r18.ru2006-03-061-1/+4
| | * | | | Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598msvensson@devsrv-b.mysql.com2006-01-091-2/+3
| | |\ \ \ \
* | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmsvensson@shellback.(none)2006-03-011-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | fix for bug #16400andrey@lmy004.2006-02-241-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279msvensson@devsrv-b.mysql.com2006-02-281-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Bug#17279 user with no global privs and with create priv in db can create dat...msvensson@devsrv-b.mysql.com2006-02-271-1/+3
* | | | | make declarations of mysql_db_table_last_check and mysql_db_table_fieldsandrey@lmy004.2006-02-141-4/+4
* | | | | manual mergeandrey@lmy004.2006-02-141-3/+119
|\ \ \ \ \
| * | | | | - final fixes for bug#16431 (Events: An event which alters itself disappears)andrey@lmy004.2006-02-141-3/+119
* | | | | | Merge mysql.com:/home/kostja/mysql/mysql-5.0-rootkonstantin@mysql.com2006-02-091-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixed BUG#16303: erroneus stored procedures and functions should be droppablepem@mysql.com2006-01-261-1/+1
* | | | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0pem@mysql.com2006-01-181-19/+39
| |\ \ \ \ \
| * | | | | | Fixed BUG#14834: Server denies to execute Stored Procedurepem@mysql.com2005-12-151-1/+1
* | | | | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-4/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2006-01-161-4/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ mergedserg@serg.mylan2006-01-061-5/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergedserg@serg.mylan2006-01-031-4/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-4/+2
| | | | |/ / / / / | | | |/| | | | |