diff options
| author | monty@hundin.mysql.fi <> | 2002-01-30 16:09:35 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-30 16:09:35 +0200 |
| commit | 3457b6fde0ee4c08a45a2a1584522b260c444768 (patch) | |
| tree | b34062344d2c8a402162a751deff0e290b6541a9 | |
| parent | b908f410fbe1c9e27042fb40950398baca0e7db7 (diff) | |
| parent | fef87f20af68e96a586a5d4966cccccea494bb2e (diff) | |
| download | mariadb-git-3457b6fde0ee4c08a45a2a1584522b260c444768.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 367591f6039..5afd24ae174 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46892,6 +46892,8 @@ not yet 100% confident in this code. Fixed bug in complicated join with @code{const} tables. @item Added internal safety checks for InnoDB. +@item +@code{SHOW GRANTS} now shows @code{REFERENCES} instead of @code{REFERENCE}. @end itemize @node News-3.23.47, News-3.23.46, News-3.23.48, News-3.23.x diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ce66b60a49f..7ad778cf5d0 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2315,7 +2315,7 @@ uint get_column_grant(THD *thd, TABLE_LIST *table, Field *field) static const char *command_array[]= {"SELECT", "INSERT","UPDATE","DELETE","CREATE", "DROP","RELOAD","SHUTDOWN", "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) { |