Skip to content

M
mariadb
Commit 3457b6fd authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files
Options

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

parents b908f410 fef87f20
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
Docs/manual.texi
View file @ 3457b6fd
...@@ -46892,6 +46892,8 @@ not yet 100% confident in this code. ...@@ -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
sql/sql_acl.cc
View file @ 3457b6fd
...@@ -2315,7 +2315,7 @@ uint get_column_grant(THD *thd, TABLE_LIST *table, Field *field) ...@@ -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)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7