Author: paul
Date: 2010-10-30 06:03:09 +0200 (Sat, 30 Oct 2010)
New Revision: 23474
Log:
r64912@frost: paul | 2010-10-29 20:36:22 -0500
Refactor grammar for user specification
(ancticipation for adding IDENTIFIED WITH clause for WL#1054)
Modified:
trunk/refman-4.1/sql-syntax-server-administration.xml
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-5.5/sql-syntax-server-administration.xml
trunk/refman-5.6/sql-syntax-server-administration.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43731
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64906
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43731
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64912
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 1361 bytes
@@ -227,8 +227,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -239,6 +238,9 @@
| <replaceable>db_name.tbl_name</replaceable>
| <replaceable>tbl_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 4; 2048 bytes
@@ -60,8 +60,10 @@
<remark role="help-syntax"/>
<programlisting>
-CREATE USER <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+CREATE USER <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
+
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
</programlisting>
<remark role="help-description-begin"/>
@@ -324,8 +326,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON [<replaceable>object_type</replaceable>] <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -342,6 +343,9 @@
| <replaceable>tbl_name</replaceable>
| <replaceable>db_name</replaceable>.<replaceable>routine_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 4; 2048 bytes
@@ -60,8 +60,10 @@
<remark role="help-syntax"/>
<programlisting>
-CREATE USER <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+CREATE USER <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
+
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
</programlisting>
<remark role="help-description-begin"/>
@@ -263,8 +265,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON [<replaceable>object_type</replaceable>] <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -281,6 +282,9 @@
| <replaceable>tbl_name</replaceable>
| <replaceable>db_name</replaceable>.<replaceable>routine_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
Modified: trunk/refman-5.5/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-5.5/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 4; 2048 bytes
@@ -60,8 +60,10 @@
<remark role="help-syntax"/>
<programlisting>
-CREATE USER <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+CREATE USER <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
+
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
</programlisting>
<remark role="help-description-begin"/>
@@ -263,8 +265,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON [<replaceable>object_type</replaceable>] <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -281,6 +282,9 @@
| <replaceable>tbl_name</replaceable>
| <replaceable>db_name</replaceable>.<replaceable>routine_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
Modified: trunk/refman-5.6/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-5.6/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 4; 2048 bytes
@@ -60,8 +60,10 @@
<remark role="help-syntax"/>
<programlisting>
-CREATE USER <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+CREATE USER <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
+
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
</programlisting>
<remark role="help-description-begin"/>
@@ -263,8 +265,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON [<replaceable>object_type</replaceable>] <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -281,6 +282,9 @@
| <replaceable>tbl_name</replaceable>
| <replaceable>db_name</replaceable>.<replaceable>routine_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2010-10-29 20:07:17 UTC (rev 23473)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2010-10-30 04:03:09 UTC (rev 23474)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 4; 2048 bytes
@@ -60,8 +60,10 @@
<remark role="help-syntax"/>
<programlisting>
-CREATE USER <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+CREATE USER <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
+
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
</programlisting>
<remark role="help-description-begin"/>
@@ -263,8 +265,7 @@
<replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]
[, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
ON [<replaceable>object_type</replaceable>] <replaceable>priv_level</replaceable>
- TO <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
- [, <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']] ...
+ TO <replaceable>user_specification</replaceable> [, <replaceable>user_specification</replaceable>] ...
[REQUIRE {NONE | <replaceable>ssl_option</replaceable> [[AND] <replaceable>ssl_option</replaceable>] ...}]
[WITH <replaceable>with_option</replaceable> ...]
@@ -281,6 +282,9 @@
| <replaceable>tbl_name</replaceable>
| <replaceable>db_name</replaceable>.<replaceable>routine_name</replaceable>
+<replaceable>user_specification</replaceable>:
+ <replaceable>user</replaceable> [IDENTIFIED BY [PASSWORD] '<replaceable>password</replaceable>']
+
<replaceable>ssl_option</replaceable>:
SSL
| X509
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23474 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 30 Oct |
