Author: paul
Date: 2006-10-27 17:50:35 +0200 (Fri, 27 Oct 2006)
New Revision: 3771
Log:
r11353@frost: paul | 2006-10-27 10:50:19 -0500
Add a bit more info about format of user values for account-management
statements.
Modified:
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14907
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11350
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10957
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14907
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11353
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10957
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-10-27 15:34:06 UTC (rev 3770)
+++ trunk/refman-4.1/sql-syntax.xml 2006-10-27 15:50:35 UTC (rev 3771)
Changed blocks: 3, Lines Added: 18, Lines Deleted: 10; 2611 bytes
@@ -10891,11 +10891,11 @@
<literal>DELETE</literal> privilege for the
<literal>mysql</literal> database. Each account is named using
the same format as for the <literal>GRANT</literal> statement;
- for example, <literal>'jeffrey'@'localhost'</literal>. The
- user and host parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ for example, <literal>'jeffrey'@'localhost'</literal>. If you
+ specify only the username part of the account name, a hostname
+ part of <literal>'%'</literal> is used. For additional
+ information about specifying account names, see
+ <xref linkend="grant"/>.
</para>
<remark role="help-description-end"/>
@@ -12008,6 +12008,15 @@
</para>
<para>
+ Each account is named using the same format as for the
+ <literal>GRANT</literal> statement; for example,
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
+ </para>
+
+ <para>
For details on the levels at which privileges exist, the
allowable <replaceable>priv_type</replaceable> values, and the
syntax for specifying users and passwords, see
@@ -14851,11 +14860,10 @@
that are granted to a MySQL user account. The account is named
using the same format as for the <literal>GRANT</literal>
statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<programlisting>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-10-27 15:34:06 UTC (rev 3770)
+++ trunk/refman-5.0/sql-syntax.xml 2006-10-27 15:50:35 UTC (rev 3771)
Changed blocks: 6, Lines Added: 27, Lines Deleted: 21; 4592 bytes
@@ -12195,11 +12195,10 @@
error occurs if the account already exists. Each account is
named using the same format as for the
<literal>GRANT</literal> statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<para>
@@ -12284,11 +12283,11 @@
<literal>DELETE</literal> privilege for the
<literal>mysql</literal> database. Each account is named using
the same format as for the <literal>GRANT</literal> statement;
- for example, <literal>'jeffrey'@'localhost'</literal>. The
- user and host parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ for example, <literal>'jeffrey'@'localhost'</literal>. If you
+ specify only the username part of the account name, a hostname
+ part of <literal>'%'</literal> is used. For additional
+ information about specifying account names, see
+ <xref linkend="grant"/>.
</para>
<para>
@@ -13452,11 +13451,10 @@
account does not exist or any new account exists. Each account
is named using the same format as for the
<literal>GRANT</literal> statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<remark role="help-description-end"/>
@@ -13523,6 +13521,15 @@
</para>
<para>
+ Each account is named using the same format as for the
+ <literal>GRANT</literal> statement; for example,
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
+ </para>
+
+ <para>
For details on the levels at which privileges exist, the
allowable <replaceable>priv_type</replaceable> values, and the
syntax for specifying users and passwords, see
@@ -13564,7 +13571,7 @@
<literal>REVOKE</literal> removes privileges, but does not
drop <literal>user</literal> table entries. You must do that
explicitly using <literal>DELETE</literal> or <literal>DROP
- USER</literal> (see <xref linkend="drop-user"/>).
+ USER</literal> (see <xref linkend="drop-user"/>).
</para>
</section>
@@ -16687,11 +16694,10 @@
that are granted to a MySQL user account. The account is named
using the same format as for the <literal>GRANT</literal>
statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<programlisting>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-10-27 15:34:06 UTC (rev 3770)
+++ trunk/refman-5.1/sql-syntax.xml 2006-10-27 15:50:35 UTC (rev 3771)
Changed blocks: 10, Lines Added: 41, Lines Deleted: 35; 6567 bytes
@@ -13521,11 +13521,10 @@
privileges. An error occurs if the account already exists.
Each account is named using the same format as for the
<literal>GRANT</literal> statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<para>
@@ -13611,11 +13610,11 @@
<literal>DELETE</literal> privilege for the
<literal>mysql</literal> database. Each account is named using
the same format as for the <literal>GRANT</literal> statement;
- for example, <literal>'jeffrey'@'localhost'</literal>. The
- user and host parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ for example, <literal>'jeffrey'@'localhost'</literal>. If you
+ specify only the username part of the account name, a hostname
+ part of <literal>'%'</literal> is used. For additional
+ information about specifying account names, see
+ <xref linkend="grant"/>.
</para>
<para>
@@ -14727,11 +14726,10 @@
account does not exist or any new account exists. Each account
is named using the same format as for the
<literal>GRANT</literal> statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<remark role="help-description-end"/>
@@ -14793,6 +14791,15 @@
</para>
<para>
+ Each account is named using the same format as for the
+ <literal>GRANT</literal> statement; for example,
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
+ </para>
+
+ <para>
For details on the levels at which privileges exist, the
allowable <replaceable>priv_type</replaceable> values, and the
syntax for specifying users and passwords, see
@@ -14834,7 +14841,7 @@
<literal>REVOKE</literal> removes privileges, but does not
drop <literal>user</literal> table entries. You must do that
explicitly using <literal>DELETE</literal> or <literal>DROP
- USER</literal> (see <xref linkend="drop-user"/>).
+ USER</literal> (see <xref linkend="drop-user"/>).
</para>
</section>
@@ -16997,7 +17004,7 @@
<indexterm type="function">
<primary>SHOW PROCESSLIST</primary>
</indexterm>
-
+
<indexterm type="function">
<primary>SHOW SCHEDULER STATUS</primary>
</indexterm>
@@ -18383,11 +18390,10 @@
that are granted to a MySQL user account. The account is named
using the same format as for the <literal>GRANT</literal>
statement; for example,
- <literal>'jeffrey'@'localhost'</literal>. The user and host
- parts of the account name correspond to the
- <literal>User</literal> and <literal>Host</literal> column
- values of the <literal>user</literal> table row for the
- account.
+ <literal>'jeffrey'@'localhost'</literal>. If you specify only
+ the username part of the account name, a hostname part of
+ <literal>'%'</literal> is used. For additional information
+ about specifying account names, see <xref linkend="grant"/>.
</para>
<programlisting>
@@ -19769,24 +19775,25 @@
</para>
</section>
-
+
<section id="show-scheduler-status">
+
<title><literal>SHOW SCHEDULER STATUS</literal> Syntax</title>
-
+
<remark role="todo">
[js] Add pointer to SHOW EVENT STATUS when that statement is
implemented.
</remark>
-
+
<indexterm>
<primary>Event Scheduler</primary>
<secondary>obtaining status information</secondary>
</indexterm>
-
+
<programlisting>
SHOW SCHEDULER STATUS
-</programlisting>
-
+</programlisting>
+
<para>
This statement provides debugging information regarding the
Event Scheduler's state. It is supported only in
@@ -19797,7 +19804,7 @@
<para>
Sample output is shown here:
</para>
-
+
<programlisting>
+--------------------------------+---------------------+
| Name | Value |
@@ -19820,18 +19827,17 @@
| next activation at | 0-00-00 00:00:00 |
+--------------------------------+---------------------+
</programlisting>
-
+
<para>
In MySQL 5.1.12 and later, this information can be obtained
- using <command>mysqladmin debug</command>. (See
+ using <command>mysqladmin debug</command>. (See
<xref linkend="mysqladmin"/>.) For more information about
- obtaining Event Scheduler status information, see
+ obtaining Event Scheduler status information, see
<xref linkend="events-status-info"/>.
</para>
-
+
</section>
-
-
+
<section id="show-status">
<title><literal>SHOW STATUS</literal> Syntax</title>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3771 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 27 Oct |
