summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | |\ \ | | | |/
| | | * Bug #46019: ERROR 1356 When selecting from within anotherGeorgi Kodinov2009-08-191-4/+8
| | | * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-4/+4
* | | | 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
|/ /
* | Bug#44834 strxnmov is expected to behave as you'd expectSergey Glukhov2009-06-191-2/+2
| |
| \
*-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-23/+20
|\ \ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-17/+17
| * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-17/+17
| |/
* | Bug#45100: Incomplete DROP USER in case of SQL_MODE = 'PAD_CHAR_TO_FULL_LENGTH'Davi Arnaut2009-06-121-0/+4
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-06-041-0/+1
|\ \ | |/
| * Bug#44798 MySQL engine crashes when creating stored procedures with execute_p...Sergey Glukhov2009-06-041-0/+1
* | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-1/+1
* | AutomergeKristofer Pettersson2009-05-291-40/+42
|\ \
| * | Bug#44658 Create procedure makes server crash when user does not have ALL pri...Kristofer Pettersson2009-05-291-40/+42
* | | Bug#42158: leak: SSL_get_peer_certificate() doesn't have matching X509_free()Davi Arnaut2009-05-251-2/+9
|/ /
* | Manually merge BUG#37145 to 5.1-bugteamHe Zhenxing2009-04-091-1/+2
|\ \ | |/
| * BUG#37145 Killing a statement doing DDL may log binlog event with error code ...He Zhenxing2009-03-271-8/+16
| * auto-mergeIgnacio Galarza2009-03-191-6/+22
| |\
| | * Bug #41354: Access control is bypassed when all columns Georgi Kodinov2009-02-261-6/+22
| * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-31/+31
| |/
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-241-0/+2
|\ \ | |/
| * compiler warning fixSergey Glukhov2008-12-241-0/+2
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-231-36/+85
|\ \ | |/
| * Bug#41079 information_schema.schema_privileges is limited to 7680 records.Sergey Glukhov2008-12-231-35/+84
* | Bug#36086: SELECT * from views don't check column grantsMartin Hansson2008-09-031-21/+33
* | Manual merge 5.0->5.1Kristofer Pettersson2008-08-061-1/+0
|\ \ | |/
| * Bug#37781 mysql_drop_user calls get_current_user() twice for no reasonKristofer Pettersson2008-07-291-1/+0
* | Merge fix for BUG#35478 into 5.1Sergey Petrunia2008-07-151-3/+4
|\ \ | |/
| * BUG#35478: sort_union() returns bad data when sort_buffer_size is hitSergey Petrunia2008-07-151-3/+4
| * Merge bk-internal:/home/bk/mysql-5.0unknown2008-03-281-0/+7
| |\
| | * Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201unknown2008-03-271-0/+7
| | |\
* | | | Merge error between two patches caused error out-of-bounds assignment.unknown2008-04-081-3/+3
* | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1unknown2008-03-281-25/+86
|\ \ \ \
| * \ \ \ Merge mysql.com:/misc/mysql/mysql-5.1unknown2008-03-271-3/+3
| |\ \ \ \
| | * \ \ \ Merge host.loc:/home/uchum/work/mysql-5.1unknown2008-03-271-3/+3
| | |\ \ \ \
| | | * \ \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optunknown2008-03-211-3/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)unknown2008-03-211-3/+3
| | | | |/ /