summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant2.result
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-3/+3
|\
| * Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-2/+2
| |\
| | * Backport Post fix of result files after push of BUG#34227He Zhenxing2009-10-021-2/+2
| * | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-1/+1
| |/
* | Bug#48319: Server crashes on "GRANT/REVOKE ... TO CURRENT_USER"Tatiana A. Nurnberg2009-10-291-0/+27
|/
* Merge 5.0 -> 5.1Matthias Leich2009-02-031-11/+12
|\
| * 1. Slice of fix for Bug#42003 tests missing the disconnect of connections <> ...Matthias Leich2009-02-021-11/+12
* | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-061-1/+1
|\ \
| * | Bug#36086: SELECT * from views don't check column grantsMartin Hansson2008-09-031-1/+1
* | | BUG#37975: wait_for_slave_* should increase the timeoutSven Sandberg2008-07-101-1/+2
|/ /
* | merged the fix for bug 30468 to 5.1-optgkodinov/kgeorge@magare.gmz2007-09-271-0/+18
|\ \ | |/
| * Bug #30468: column level privileges not respected when joining tablesgkodinov/kgeorge@magare.gmz2007-09-271-0/+18
* | grant2.result:evgen@moonbone.local2007-06-111-18/+18
* | Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysqlevgen@moonbone.local2007-06-111-0/+18
|\ \ | |/
| * Bug#18660 Can't grant any privileges on single table in database with undersc...gluh@mysql.com/eagle.(none)2007-06-081-0/+18
* | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-likedlenev@mockturtle.local2007-05-231-0/+1
|\ \ | |/
| * 5.0 version of fix for:dlenev@mockturtle.local2007-05-231-0/+24
* | 5.1 version of fix for:dlenev@mockturtle.local2007-05-231-0/+23
* | Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBRtnurnberg@salvation.intern.azundris.com2006-11-171-2/+4
* | Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_toolsmsvensson@neptunus.(none)2006-10-041-4/+4
|\ \ | |/
| * Update tests and result files after running with new mysqltest that better de...msvensson@neptunus.(none)2006-10-041-4/+4
* | Merge zim.(none):/home/brian/mysql/dep-5.0brian@zim.(none)2006-08-141-0/+10
|\ \ | |/
| * Merge updates.cmiller@zippy.cornsilk.net2006-08-101-2/+2
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1cmiller@zippy.cornsilk.net2006-08-091-0/+10
| |\
| | * Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignorediggy@mysql.com2006-06-271-0/+10
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-04-301-0/+14
|\ \ \ | |/ /
| * | Cleanup test cases that leaves "stuff" behindmsvensson@neptunus.(none)2006-04-181-0/+1
| * | BUG#13310 incorrect user parsing by SPmsvensson@shellback.(none)2006-04-181-0/+13
* | | Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0pem@mysql.com2006-03-031-1/+1
|\ \ \ | |/ /
| * | Bug#17279 user with no global privs and with create priv in db can createmsvensson@neptunus.(none)2006-03-021-1/+1
* | | Merge 5.0 -> 5.1msvensson@shellback.(none)2006-02-281-8/+7
|/ /
* | Bug#17279 user with no global privs and with create priv in db can create dat...msvensson@devsrv-b.mysql.com2006-02-271-0/+22
* | Add new option "check-testcases" to mysql-test-run.plmsvensson@neptunus.(none)2006-01-261-0/+2
* | Bug #15775 "drop user" command does not refresh acl_check_hostsmsvensson@neptunus.(none)2005-12-281-8/+7
* | Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2msvensson@neptunus.(none)2005-12-281-0/+12
|\ \ | |/
| * BUG#15775 "drop user" command does not refresh acl_check_hostsmsvensson@neptunus.(none)2005-12-281-0/+12
* | Don't use PATH_MAX for FN_REFLEN as this uses too much stack spacemonty@mysql.com2005-11-241-1/+1
* | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423dlenev@mysql.com2005-09-011-0/+9
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-09-011-0/+9
| |\
| | * Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in dlenev@mysql.com2005-09-011-0/+9
* | | Merge mishka.local:/home/my/mysql-4.1monty@mishka.local2005-08-251-0/+26
|\ \ \ | |/ /
| * | Use the hostname with which the user authenticated when determining whichjimw@mysql.com2005-08-221-0/+26
| |/
* | Mergejimw@mysql.com2005-04-051-0/+4
|\ \
| * | Enable warnings for 'no default' fields being set to default when theyjimw@mysql.com2005-01-141-0/+4
* | | after merge fixserg@serg.mylan2005-03-301-0/+1
* | | Mergepekka@mysql.com2005-03-281-3/+20
|\ \ \ | | |/ | |/|
| * | more wild_compare testsserg@serg.mylan2005-03-271-3/+20
* | | sql/sql_acl.ccserg@serg.mylan2005-03-231-8/+6
* | | mergedserg@serg.mylan2005-03-231-12/+11
|\ \ \
| * | | sql_acl.cc, sql_acl.h, sql_parse.ccmysqldev@mysql.com2005-03-221-12/+27