Author: paul
Date: 2006-02-02 21:07:38 +0100 (Thu, 02 Feb 2006)
New Revision: 1187
Log:
r2793@kite-hub: paul | 2006-02-02 11:34:32 -0600
Remove host table from table that shows privilege columns.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2792
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2793
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-02-02 20:07:23 UTC (rev 1186)
+++ trunk/refman-4.1/database-administration.xml 2006-02-02 20:07:38 UTC (rev 1187)
@@ -10706,213 +10706,183 @@
The server uses the <literal>user</literal>,
<literal>db</literal>, and <literal>host</literal> tables in the
<literal>mysql</literal> database at both stages of access
- control. The columns in these grant tables are shown here:
+ control. The columns in the <literal>user</literal> and
+ <literal>db</literal> tables are shown here. The
+ <literal>host</literal> table is similar to the
+ <literal>db</literal> table but has a specialized use as
+ described in <xref linkend="request-access"/>.
</para>
<informaltable>
- <tgroup cols="4">
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
+ <tgroup cols="3">
+ <colspec colwidth="40*"/>
+ <colspec colwidth="30*"/>
+ <colspec colwidth="30*"/>
<tbody>
<row>
<entry><emphasis role="bold">Table Name</emphasis></entry>
<entry><emphasis role="bold">user</emphasis></entry>
<entry><emphasis role="bold">db</emphasis></entry>
- <entry><emphasis role="bold">host</emphasis></entry>
</row>
<row>
<entry><emphasis role="bold">Scope columns</emphasis></entry>
<entry><literal>Host</literal></entry>
<entry><literal>Host</literal></entry>
- <entry><literal>Host</literal></entry>
</row>
<row>
<entry/>
<entry><literal>User</literal></entry>
<entry><literal>Db</literal></entry>
- <entry><literal>Db</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Password</literal></entry>
<entry><literal>User</literal></entry>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Privilege columns</emphasis></entry>
<entry><literal>Select_priv</literal></entry>
<entry><literal>Select_priv</literal></entry>
- <entry><literal>Select_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Insert_priv</literal></entry>
<entry><literal>Insert_priv</literal></entry>
- <entry><literal>Insert_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Update_priv</literal></entry>
<entry><literal>Update_priv</literal></entry>
- <entry><literal>Update_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Delete_priv</literal></entry>
<entry><literal>Delete_priv</literal></entry>
- <entry><literal>Delete_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Index_priv</literal></entry>
<entry><literal>Index_priv</literal></entry>
- <entry><literal>Index_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Alter_priv</literal></entry>
<entry><literal>Alter_priv</literal></entry>
- <entry><literal>Alter_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_priv</literal></entry>
<entry><literal>Create_priv</literal></entry>
- <entry><literal>Create_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Drop_priv</literal></entry>
<entry><literal>Drop_priv</literal></entry>
- <entry><literal>Drop_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Grant_priv</literal></entry>
<entry><literal>Grant_priv</literal></entry>
- <entry><literal>Grant_priv</literal></entry>
</row>
<row>
<entry/>
- <entry><literal>Execute_priv</literal></entry>
- <entry/>
- <entry/>
+ <entry><literal>References_priv</literal></entry>
+ <entry><literal>References_priv</literal></entry>
</row>
<row>
<entry/>
- <entry><literal>References_priv</literal></entry>
- <entry><literal>References_priv</literal></entry>
- <entry><literal>References_priv</literal></entry>
+ <entry><literal>Execute_priv</literal></entry>
+ <entry/>
</row>
<row>
<entry/>
<entry><literal>Reload_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Shutdown_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Process_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>File_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Show_db_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Super_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Create_tmp_table_priv</literal></entry>
<entry><literal>Create_tmp_table_priv</literal></entry>
- <entry><literal>Create_tmp_table_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Lock_tables_priv</literal></entry>
<entry><literal>Lock_tables_priv</literal></entry>
- <entry><literal>Lock_tables_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Repl_slave_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Repl_client_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Security columns</emphasis></entry>
<entry><literal>ssl_type</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>ssl_cipher</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_issuer</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_subject</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Resource control columns</emphasis></entry>
<entry><literal>max_questions</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_updates</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_connections</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_user_connections</literal></entry>
<entry/>
- <entry/>
</row>
</tbody>
</tgroup>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-02-02 20:07:23 UTC (rev 1186)
+++ trunk/refman-5.0/database-administration.xml 2006-02-02 20:07:38 UTC (rev 1187)
@@ -12710,237 +12710,203 @@
The server uses the <literal>user</literal>,
<literal>db</literal>, and <literal>host</literal> tables in the
<literal>mysql</literal> database at both stages of access
- control. The columns in these grant tables are shown here:
+ control. The columns in the <literal>user</literal> and
+ <literal>db</literal> tables are shown here. The
+ <literal>host</literal> table is similar to the
+ <literal>db</literal> table but has a specialized use as
+ described in <xref linkend="request-access"/>.
</para>
<informaltable>
- <tgroup cols="4">
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
+ <tgroup cols="3">
+ <colspec colwidth="40*"/>
+ <colspec colwidth="30*"/>
+ <colspec colwidth="30*"/>
<tbody>
<row>
<entry><emphasis role="bold">Table Name</emphasis></entry>
<entry><emphasis role="bold">user</emphasis></entry>
<entry><emphasis role="bold">db</emphasis></entry>
- <entry><emphasis role="bold">host</emphasis></entry>
</row>
<row>
<entry><emphasis role="bold">Scope columns</emphasis></entry>
<entry><literal>Host</literal></entry>
<entry><literal>Host</literal></entry>
- <entry><literal>Host</literal></entry>
</row>
<row>
<entry/>
<entry><literal>User</literal></entry>
<entry><literal>Db</literal></entry>
- <entry><literal>Db</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Password</literal></entry>
<entry><literal>User</literal></entry>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Privilege columns</emphasis></entry>
<entry><literal>Select_priv</literal></entry>
<entry><literal>Select_priv</literal></entry>
- <entry><literal>Select_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Insert_priv</literal></entry>
<entry><literal>Insert_priv</literal></entry>
- <entry><literal>Insert_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Update_priv</literal></entry>
<entry><literal>Update_priv</literal></entry>
- <entry><literal>Update_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Delete_priv</literal></entry>
<entry><literal>Delete_priv</literal></entry>
- <entry><literal>Delete_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Index_priv</literal></entry>
<entry><literal>Index_priv</literal></entry>
- <entry><literal>Index_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Alter_priv</literal></entry>
<entry><literal>Alter_priv</literal></entry>
- <entry><literal>Alter_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_priv</literal></entry>
<entry><literal>Create_priv</literal></entry>
- <entry><literal>Create_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Drop_priv</literal></entry>
<entry><literal>Drop_priv</literal></entry>
- <entry><literal>Drop_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Grant_priv</literal></entry>
<entry><literal>Grant_priv</literal></entry>
- <entry><literal>Grant_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_view_priv</literal></entry>
<entry><literal>Create_view_priv</literal></entry>
- <entry><literal>Create_view_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Show_view_priv</literal></entry>
<entry><literal>Show_view_priv</literal></entry>
- <entry><literal>Show_view_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_routine_priv</literal></entry>
<entry><literal>Create_routine_priv</literal></entry>
- <entry><literal>Create_routine_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Alter_routine_priv</literal></entry>
<entry><literal>Alter_routine_priv</literal></entry>
- <entry><literal>Alter_routine_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Execute_priv</literal></entry>
<entry><literal>Execute_priv</literal></entry>
- <entry><literal>Execute_priv</literal></entry>
</row>
<row>
<entry/>
+ <entry><literal>Create_tmp_table_priv</literal></entry>
+ <entry><literal>Create_tmp_table_priv</literal></entry>
+ </row>
+ <row>
+ <entry/>
+ <entry><literal>Lock_tables_priv</literal></entry>
+ <entry><literal>Lock_tables_priv</literal></entry>
+ </row>
+ <row>
+ <entry/>
<entry><literal>References_priv</literal></entry>
<entry><literal>References_priv</literal></entry>
- <entry><literal>References_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Reload_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Shutdown_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Process_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>File_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Show_db_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Super_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- </row>
- <row>
- <entry/>
- <entry><literal>Lock_tables_priv</literal></entry>
- <entry><literal>Lock_tables_priv</literal></entry>
- <entry><literal>Lock_tables_priv</literal></entry>
- </row>
- <row>
- <entry/>
<entry><literal>Repl_slave_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Repl_client_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Security columns</emphasis></entry>
<entry><literal>ssl_type</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>ssl_cipher</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_issuer</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_subject</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Resource control columns</emphasis></entry>
<entry><literal>max_questions</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_updates</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_connections</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_user_connections</literal></entry>
<entry/>
- <entry/>
</row>
</tbody>
</tgroup>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-02-02 20:07:23 UTC (rev 1186)
+++ trunk/refman-5.1/database-administration.xml 2006-02-02 20:07:38 UTC (rev 1187)
@@ -12798,249 +12798,213 @@
The server uses the <literal>user</literal>,
<literal>db</literal>, and <literal>host</literal> tables in the
<literal>mysql</literal> database at both stages of access
- control. The columns in these grant tables are shown here:
+ control. The columns in the <literal>user</literal> and
+ <literal>db</literal> tables are shown here. The
+ <literal>host</literal> table is similar to the
+ <literal>db</literal> table but has a specialized use as
+ described in <xref linkend="request-access"/>.
</para>
<informaltable>
- <tgroup cols="4">
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
- <colspec colwidth="25*"/>
+ <tgroup cols="3">
+ <colspec colwidth="40*"/>
+ <colspec colwidth="30*"/>
+ <colspec colwidth="30*"/>
<tbody>
<row>
<entry><emphasis role="bold">Table Name</emphasis></entry>
<entry><emphasis role="bold">user</emphasis></entry>
<entry><emphasis role="bold">db</emphasis></entry>
- <entry><emphasis role="bold">host</emphasis></entry>
</row>
<row>
<entry><emphasis role="bold">Scope columns</emphasis></entry>
<entry><literal>Host</literal></entry>
<entry><literal>Host</literal></entry>
- <entry><literal>Host</literal></entry>
</row>
<row>
<entry/>
<entry><literal>User</literal></entry>
<entry><literal>Db</literal></entry>
- <entry><literal>Db</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Password</literal></entry>
<entry><literal>User</literal></entry>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Privilege columns</emphasis></entry>
<entry><literal>Select_priv</literal></entry>
<entry><literal>Select_priv</literal></entry>
- <entry><literal>Select_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Insert_priv</literal></entry>
<entry><literal>Insert_priv</literal></entry>
- <entry><literal>Insert_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Update_priv</literal></entry>
<entry><literal>Update_priv</literal></entry>
- <entry><literal>Update_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Delete_priv</literal></entry>
<entry><literal>Delete_priv</literal></entry>
- <entry><literal>Delete_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Index_priv</literal></entry>
<entry><literal>Index_priv</literal></entry>
- <entry><literal>Index_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Alter_priv</literal></entry>
<entry><literal>Alter_priv</literal></entry>
- <entry><literal>Alter_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_priv</literal></entry>
<entry><literal>Create_priv</literal></entry>
- <entry><literal>Create_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Drop_priv</literal></entry>
<entry><literal>Drop_priv</literal></entry>
- <entry><literal>Drop_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Grant_priv</literal></entry>
<entry><literal>Grant_priv</literal></entry>
- <entry><literal>Grant_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_view_priv</literal></entry>
<entry><literal>Create_view_priv</literal></entry>
- <entry><literal>Create_view_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Show_view_priv</literal></entry>
<entry><literal>Show_view_priv</literal></entry>
- <entry><literal>Show_view_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Create_routine_priv</literal></entry>
<entry><literal>Create_routine_priv</literal></entry>
- <entry><literal>Create_routine_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Alter_routine_priv</literal></entry>
<entry><literal>Alter_routine_priv</literal></entry>
- <entry><literal>Alter_routine_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Execute_priv</literal></entry>
<entry><literal>Execute_priv</literal></entry>
- <entry><literal>Execute_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Trigger_priv</literal></entry>
<entry><literal>Trigger_priv</literal></entry>
- <entry><literal>Trigger_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Event_priv</literal></entry>
<entry><literal>Event_priv</literal></entry>
- <entry><literal>Event_priv</literal></entry>
</row>
<row>
<entry/>
+ <entry><literal>Create_tmp_table_priv</literal></entry>
+ <entry><literal>Create_tmp_table_priv</literal></entry>
+ </row>
+ <row>
+ <entry/>
+ <entry><literal>Lock_tables_priv</literal></entry>
+ <entry><literal>Lock_tables_priv</literal></entry>
+ </row>
+ <row>
+ <entry/>
<entry><literal>References_priv</literal></entry>
<entry><literal>References_priv</literal></entry>
- <entry><literal>References_priv</literal></entry>
</row>
<row>
<entry/>
<entry><literal>Reload_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Shutdown_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Process_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>File_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Show_db_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Super_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- <entry><literal>Create_tmp_table_priv</literal></entry>
- </row>
- <row>
- <entry/>
- <entry><literal>Lock_tables_priv</literal></entry>
- <entry><literal>Lock_tables_priv</literal></entry>
- <entry><literal>Lock_tables_priv</literal></entry>
- </row>
- <row>
- <entry/>
<entry><literal>Repl_slave_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>Repl_client_priv</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Security columns</emphasis></entry>
<entry><literal>ssl_type</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>ssl_cipher</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_issuer</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>x509_subject</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry><emphasis role="bold">Resource control columns</emphasis></entry>
<entry><literal>max_questions</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_updates</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_connections</literal></entry>
<entry/>
- <entry/>
</row>
<row>
<entry/>
<entry><literal>max_user_connections</literal></entry>
<entry/>
- <entry/>
</row>
</tbody>
</tgroup>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1187 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 2 Feb |
