1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

Browse Source
This commit is contained in:
monty@hundin.mysql.fi 2002-01-30 16:09:35 +02:00
commit 3457b6fde0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/manual.texi
View File

@ -46892,6 +46892,8 @@ not yet 100% confident in this code.
Fixed bug in complicated join with @code{const} tables. Fixed bug in complicated join with @code{const} tables.
@item @item
Added internal safety checks for InnoDB. Added internal safety checks for InnoDB.
@item
@code{SHOW GRANTS} now shows @code{REFERENCES} instead of @code{REFERENCE}.
@end itemize @end itemize
@node News-3.23.47, News-3.23.46, News-3.23.48, News-3.23.x @node News-3.23.47, News-3.23.46, News-3.23.48, News-3.23.x

2
sql/sql_acl.cc
View File

@ -2315,7 +2315,7 @@ uint get_column_grant(THD *thd, TABLE_LIST *table, Field *field)
static const char *command_array[]= static const char *command_array[]=
{"SELECT", "INSERT","UPDATE","DELETE","CREATE", "DROP","RELOAD","SHUTDOWN", {"SELECT", "INSERT","UPDATE","DELETE","CREATE", "DROP","RELOAD","SHUTDOWN",
"PROCESS","FILE","GRANT","REFERENCES","INDEX","ALTER"}; "PROCESS","FILE","GRANT","REFERENCES","INDEX","ALTER"};
static int command_lengths[]={6,6,6,6,6,4,6,8,7,4,5,9,5,5}; static int command_lengths[]={6,6,6,6,6,4,6,8,7,4,5,10,5,5};
int mysql_show_grants(THD *thd,LEX_USER *lex_user) int mysql_show_grants(THD *thd,LEX_USER *lex_user)
{ {