Commit 3457b6fd authored Jan 30, 2002 by monty@hundin.mysql.fi

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

parents b908f410 fef87f20

Docs/manual.texi

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

sql/sql_acl.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)
		{