List:Commits« Previous MessageNext Message »
From:paul Date:January 18 2006 12:46am
Subject:svn commit - mysqldoc@docsrva: r885 - in trunk: . refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-18 01:46:43 +0100 (Wed, 18 Jan 2006)
New Revision: 885

Log:
 r6332@frost:  paul | 2006-01-17 18:36:33 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-5.0/views.xml
   trunk/refman-5.1/views.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6325
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6332
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265

Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2006-01-18 00:20:29 UTC (rev 884)
+++ trunk/refman-5.0/views.xml	2006-01-18 00:46:43 UTC (rev 885)
@@ -20,8 +20,8 @@
   </indexterm>
 
   <para>
-    Views (including updatable views) are implemented in the 5.0 version
-    of MySQL Server. Views are available in binary releases from 5.0.1
+    Views (including updatable views) are implemented in MySQL Server
+    &current-series;. Views are available in binary releases from 5.0.1
     and up.
   </para>
 
@@ -179,9 +179,9 @@
 </programlisting>
 
     <para>
-      Tables and views share the same namespace within a database, so a
-      database cannot contain a table and a view that have the same
-      name.
+      Base tables and views share the same namespace within a database,
+      so a database cannot contain a base table and a view that have the
+      same name.
     </para>
 
     <para>
@@ -323,7 +323,7 @@
     <para>
       If you create a view and then change the query processing
       environment by changing system variables, that may affect the
-      results you get from the view:
+      results that you get from the view:
     </para>
 
 <programlisting>
@@ -381,7 +381,7 @@
       <replaceable>user</replaceable> value is given, it should be a
       MySQL account in
       <literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
-      format (the same format as for the <literal>GRANT</literal>
+      format (the same format used in the <literal>GRANT</literal>
       statement). The <replaceable>user_name</replaceable> and
       <replaceable>host_name</replaceable> values both are required.
     </para>
@@ -417,16 +417,18 @@
 
     <para>
       The <literal>SQL SECURITY</literal> characteristic determines
-      which account to use when checking access privileges for the view
-      when the view is executed. The legal characteristic values are
-      <literal>DEFINER</literal> and <literal>INVOKER</literal>. These
-      indicate that the view must be executable by the user who defined
-      it or invoked it, respectively. The default <literal>SQL
+      which MySQL account to use when checking access privileges for the
+      view when the view is executed. The legal characteristic values
+      are <literal>DEFINER</literal> and <literal>INVOKER</literal>.
+      These indicate that the view must be executable by the user who
+      defined it or invoked it, respectively. The default <literal>SQL
       SECURITY</literal> value is <literal>DEFINER</literal>.
     </para>
 
     <para>
-      As of MySQL 5.0.16, view privileges are checked like this:
+      As of MySQL 5.0.16 (when the <literal>DEFINER</literal> and
+      <literal>SQL SECURITY</literal> clauses were implemented), view
+      privileges are checked like this:
     </para>
 
     <itemizedlist>
@@ -462,18 +464,18 @@
           depend on whether the function is defined with a <literal>SQL
           SECURITY</literal> characteristic of
           <literal>DEFINER</literal> or <literal>INVOKER</literal>. If
-          the security characteristic is <literal>DEFINER</literal>,
-          privileges within the function runs with the privileges of its
-          creator. If the characteristic is <literal>INVOKER</literal>,
-          the function runs with the privileges determined by the view's
-          <literal>SQL SECURITY</literal> characteristic.
+          the security characteristic is <literal>DEFINER</literal>, the
+          function runs with the privileges of its creator. If the
+          characteristic is <literal>INVOKER</literal>, the function
+          runs with the privileges determined by the view's <literal>SQL
+          SECURITY</literal> characteristic.
         </para>
       </listitem>
 
     </itemizedlist>
 
     <para>
-      Prior to MySQL 5.0.16 (before the <literal>DEFINE</literal> and
+      Prior to MySQL 5.0.16 (before the <literal>DEFINER</literal> and
       <literal>SQL SECURITY</literal> clauses were implemented),
       privileges required for objects used in a view are checked at view
       creation time.
@@ -527,8 +529,8 @@
       INVOKER</literal> clause and with a <literal>DEFINER</literal>
       value that is the same as your account. However, because the
       actual definer is unknown, MySQL issues a warning. To make the
-      warning go away, it is sufficient to re-create the view so that the
-      view definition includes a <literal>DEFINER</literal> clause.
+      warning go away, it is sufficient to re-create the view so that
+      the view definition includes a <literal>DEFINER</literal> clause.
     </para>
 
     <para>
@@ -571,7 +573,8 @@
     </para>
 
     <para>
-      A view algorithm can be <literal>UNDEFINED</literal> three ways:
+      A view algorithm can be <literal>UNDEFINED</literal> for three
+      reasons:
     </para>
 
     <itemizedlist>
@@ -945,11 +948,11 @@
       In a <literal>WITH CHECK OPTION</literal> clause for an updatable
       view, the <literal>LOCAL</literal> and <literal>CASCADED</literal>
       keywords determine the scope of check testing when the view is
-      defined in terms of another view. <literal>LOCAL</literal> keyword
-      restricts the <literal>CHECK OPTION</literal> only to the view
-      being defined. <literal>CASCADED</literal> causes the checks for
-      underlying views to be evaluated as well. When neither keyword is
-      given, the default is <literal>CASCADED</literal>. Consider the
+      defined in terms of another view. The <literal>LOCAL</literal>
+      keyword restricts the <literal>CHECK OPTION</literal> only to the
+      view being defined. <literal>CASCADED</literal> causes the checks
+      for underlying views to be evaluated as well. When neither keyword
+      is given, the default is <literal>CASCADED</literal>. Consider the
       definitions for the following table and set of views:
     </para>
 
@@ -975,7 +978,7 @@
     </para>
 
 <programlisting>
-ql&gt; INSERT INTO v2 VALUES (2);
+mysql&gt; <userinput>INSERT INTO v2 VALUES (2);</userinput>
 Query OK, 1 row affected (0.00 sec)
 mysql&gt; <userinput>INSERT INTO v3 VALUES (2);</userinput>
 ERROR 1369 (HY000): CHECK OPTION failed 'test.v3'
@@ -993,12 +996,6 @@
       implemented in MySQL 5.0.2.
     </para>
 
-    <para>
-      <literal>INFORMATION_SCHEMA</literal> contains a
-      <literal>VIEWS</literal> table from which information about view
-      objects can be obtained. See <xref linkend="views-table"/>.
-    </para>
-
   </section>
 
   <section id="drop-view">
@@ -1031,10 +1028,10 @@
     </para>
 
     <para>
-      You can use the keywords <literal>IF EXISTS</literal> to prevent
-      an error from occurring for views that don't exist. When this
-      clause is given, a <literal>NOTE</literal> is generated for each
-      non-existent view. See <xref linkend="show-warnings"/>.
+      The <literal>IF EXISTS</literal> clause prevents an error from
+      occurring for views that don't exist. When this clause is given, a
+      <literal>NOTE</literal> is generated for each non-existent view.
+      See <xref linkend="show-warnings"/>.
     </para>
 
     <para>
@@ -1089,11 +1086,17 @@
     </para>
 
     <para>
-      Previous to MySQL 5.0.11, the output columns from this statement
-      were shown as <literal>Table</literal> and <literal>Create
+      Prior to MySQL 5.0.11, the output columns from this statement were
+      shown as <literal>Table</literal> and <literal>Create
       Table</literal>.
     </para>
 
+    <para>
+      You can also obtain information about view objects from
+      <literal>INFORMATION_SCHEMA</literal>, which contains a
+      <literal>VIEWS</literal> table. See <xref linkend="views-table"/>.
+    </para>
+
   </section>
 
 </chapter>

Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml	2006-01-18 00:20:29 UTC (rev 884)
+++ trunk/refman-5.1/views.xml	2006-01-18 00:46:43 UTC (rev 885)
@@ -20,8 +20,8 @@
   </indexterm>
 
   <para>
-    Views (including updatable views) are available in the
-    &current-series; version of MySQL Server.
+    Views (including updatable views) are available in MySQL Server
+    &current-series;.
   </para>
 
   <para>
@@ -170,9 +170,9 @@
 </programlisting>
 
     <para>
-      Tables and views share the same namespace within a database, so a
-      database cannot contain a table and a view that have the same
-      name.
+      Base tables and views share the same namespace within a database,
+      so a database cannot contain a base table and a view that have the
+      same name.
     </para>
 
     <para>
@@ -314,7 +314,7 @@
     <para>
       If you create a view and then change the query processing
       environment by changing system variables, that may affect the
-      results you get from the view:
+      results that you get from the view:
     </para>
 
 <programlisting>
@@ -372,7 +372,7 @@
       <replaceable>user</replaceable> value is given, it should be a
       MySQL account in
       <literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
-      format (the same format as for the <literal>GRANT</literal>
+      format (the same format used in the <literal>GRANT</literal>
       statement). The <replaceable>user_name</replaceable> and
       <replaceable>host_name</replaceable> values both are required.
     </para>
@@ -408,16 +408,18 @@
 
     <para>
       The <literal>SQL SECURITY</literal> characteristic determines
-      which account to use when checking access privileges for the view
-      when the view is executed. The legal characteristic values are
-      <literal>DEFINER</literal> and <literal>INVOKER</literal>. These
-      indicate that the view must be executable by the user who defined
-      it or invoked it, respectively. The default <literal>SQL
+      which MySQL account to use when checking access privileges for the
+      view when the view is executed. The legal characteristic values
+      are <literal>DEFINER</literal> and <literal>INVOKER</literal>.
+      These indicate that the view must be executable by the user who
+      defined it or invoked it, respectively. The default <literal>SQL
       SECURITY</literal> value is <literal>DEFINER</literal>.
     </para>
 
     <para>
-      As of MySQL 5.1.2, view privileges are checked like this:
+      As of MySQL 5.1.2 (when the <literal>DEFINER</literal> and
+      <literal>SQL SECURITY</literal> clauses were implemented), view
+      privileges are checked like this:
     </para>
 
     <itemizedlist>
@@ -453,18 +455,18 @@
           depend on whether the function is defined with a <literal>SQL
           SECURITY</literal> characteristic of
           <literal>DEFINER</literal> or <literal>INVOKER</literal>. If
-          the security characteristic is <literal>DEFINER</literal>,
-          privileges within the function runs with the privileges of its
-          creator. If the characteristic is <literal>INVOKER</literal>,
-          the function runs with the privileges determined by the view's
-          <literal>SQL SECURITY</literal> characteristic.
+          the security characteristic is <literal>DEFINER</literal>, the
+          function runs with the privileges of its creator. If the
+          characteristic is <literal>INVOKER</literal>, the function
+          runs with the privileges determined by the view's <literal>SQL
+          SECURITY</literal> characteristic.
         </para>
       </listitem>
 
     </itemizedlist>
 
     <para>
-      Prior to MySQL 5.1.2 (before the <literal>DEFINE</literal> and
+      Prior to MySQL 5.1.2 (before the <literal>DEFINER</literal> and
       <literal>SQL SECURITY</literal> clauses were implemented),
       privileges required for objects used in a view are checked at view
       creation time.
@@ -518,8 +520,8 @@
       SECURITY INVOKER</literal> clause and with a
       <literal>DEFINER</literal> value that is the same as your account.
       However, because the actual definer is unknown, MySQL issues a
-      warning. To make the warning go away, it is sufficient to re-create
-      the view so that the view definition includes a
+      warning. To make the warning go away, it is sufficient to
+      re-create the view so that the view definition includes a
       <literal>DEFINER</literal> clause.
     </para>
 
@@ -563,7 +565,8 @@
     </para>
 
     <para>
-      A view algorithm can be <literal>UNDEFINED</literal> three ways:
+      A view algorithm can be <literal>UNDEFINED</literal> for three
+      reasons:
     </para>
 
     <itemizedlist>
@@ -937,11 +940,11 @@
       In a <literal>WITH CHECK OPTION</literal> clause for an updatable
       view, the <literal>LOCAL</literal> and <literal>CASCADED</literal>
       keywords determine the scope of check testing when the view is
-      defined in terms of another view. <literal>LOCAL</literal> keyword
-      restricts the <literal>CHECK OPTION</literal> only to the view
-      being defined. <literal>CASCADED</literal> causes the checks for
-      underlying views to be evaluated as well. When neither keyword is
-      given, the default is <literal>CASCADED</literal>. Consider the
+      defined in terms of another view. The <literal>LOCAL</literal>
+      keyword restricts the <literal>CHECK OPTION</literal> only to the
+      view being defined. <literal>CASCADED</literal> causes the checks
+      for underlying views to be evaluated as well. When neither keyword
+      is given, the default is <literal>CASCADED</literal>. Consider the
       definitions for the following table and set of views:
     </para>
 
@@ -967,7 +970,7 @@
     </para>
 
 <programlisting>
-ql&gt; INSERT INTO v2 VALUES (2);
+mysql&gt; <userinput>INSERT INTO v2 VALUES (2);</userinput>
 Query OK, 1 row affected (0.00 sec)
 mysql&gt; <userinput>INSERT INTO v3 VALUES (2);</userinput>
 ERROR 1369 (HY000): CHECK OPTION failed 'test.v3'
@@ -979,12 +982,6 @@
       <xref linkend="server-system-variables"/>.
     </para>
 
-    <para>
-      <literal>INFORMATION_SCHEMA</literal> contains a
-      <literal>VIEWS</literal> table from which information about view
-      objects can be obtained. See <xref linkend="views-table"/>.
-    </para>
-
   </section>
 
   <section id="drop-view">
@@ -1017,10 +1014,10 @@
     </para>
 
     <para>
-      You can use the keywords <literal>IF EXISTS</literal> to prevent
-      an error from occurring for views that don't exist. When this
-      clause is given, a <literal>NOTE</literal> is generated for each
-      non-existent view. See <xref linkend="show-warnings"/>.
+      The <literal>IF EXISTS</literal> clause prevents an error from
+      occurring for views that don't exist. When this clause is given, a
+      <literal>NOTE</literal> is generated for each non-existent view.
+      See <xref linkend="show-warnings"/>.
     </para>
 
     <para>
@@ -1066,6 +1063,12 @@
 +------+----------------------------------------------------+
 </programlisting>
 
+    <para>
+      You can also obtain information about view objects from
+      <literal>INFORMATION_SCHEMA</literal>, which contains a
+      <literal>VIEWS</literal> table. See <xref linkend="views-table"/>.
+    </para>
+
   </section>
 
 </chapter>

Thread
svn commit - mysqldoc@docsrva: r885 - in trunk: . refman-5.0 refman-5.1paul18 Jan