svn commit - mysqldoc@docsrva: r7495 - in trunk: dynamic-docs/command-optvars userguide

[plavin]

Author: plavin
Date: 2007-08-21 19:25:40 +0200 (Tue, 21 Aug 2007)
New Revision: 7495

Log:
Remove %_log_pos variables.


Modified:
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/userguide/php-pdo.xml


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2007-08-21 14:02:11 UTC (rev 7494)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2007-08-21 17:25:40 UTC (rev 7495)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 33; 2122 bytes

@@ -12130,25 +12130,9 @@
       <manual version="5.2"/>
     </versions>
   </option>
-  <option command="mysqld" section="replication" id="Exec_Master_Log_Pos">
-    <xrefto id="show-slave-status"/>
-    <name>Exec_Master_Log_Pos</name>
-    <shortdescription lang="en"> The position of the last event executed by the SQL
thread from the
-      master's binary log </shortdescription>
-    <types>
-      <vartype isdynamic="no" class="status" scope="both"/>
-    </types>
-    <values vartype="numeric" platform="all"> </values>
-    <versions>
-      <manual version="4.1"/>
-      <manual version="5.0"/>
-      <manual version="5.1"/>
-      <manual version="5.2"/>
-    </versions>
-  </option>
   <option command="mysqld" section="replication" id="Master_Log_File">
     <xrefto id="show-slave-status"/>
-    <name>Exec_Master_Log_Pos</name>
+    <name>Master_Log_File</name>
     <shortdescription lang="en"> The name of the master binary log file from which
the I/O thread is
       currently reading. </shortdescription>
     <types>

@@ -12224,22 +12208,6 @@
       <manual version="5.2"/>
     </versions>
   </option>
-  <option command="mysqld" section="replication" id="Read_Master_Log_Pos">
-    <xrefto id="show-slave-status"/>
-    <name>Read_Master_Log_Pos</name>
-    <shortdescription lang="en"> The position up to which the I/O thread has read
in the current
-      master binary log </shortdescription>
-    <types>
-      <vartype isdynamic="no" class="status" scope="both"/>
-    </types>
-    <values vartype="numeric" platform="all"> </values>
-    <versions>
-      <manual version="4.1"/>
-      <manual version="5.0"/>
-      <manual version="5.1"/>
-      <manual version="5.2"/>
-    </versions>
-  </option>
   <option command="mysqld" section="replication" id="Relay_Log_File">
     <xrefto id="show-slave-status"/>
     <name>Relay_Log_File</name>


Modified: trunk/userguide/php-pdo.xml
===================================================================
--- trunk/userguide/php-pdo.xml	2007-08-21 14:02:11 UTC (rev 7494)
+++ trunk/userguide/php-pdo.xml	2007-08-21 17:25:40 UTC (rev 7495)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 4; 1197 bytes

@@ -121,7 +121,7 @@
 
     <para>
       The attached compressed file contains all the code and preserves
-      the required directory structure. [Not yet]. Any user-defined
+      the required directory structure. [See the end of the article for a link.] Any
user-defined
       classes are found in the <filename>classes</filename> directory
       and XML files are found in the <filename>xml</filename> directory.
       The PHP scripts are found at the root directory.

@@ -609,11 +609,13 @@
   }
   }catch(PDOException $e){
     $message = $e->getMessage();
-    $db->rollBack();
+    if(isset($db)){
+    $db->rollBack(); 
+    }
   }catch(Exception $ex){
     $message = $ex->getMessage();
     if(isset($db)){
-    $db->rollBack(); 
+      $db->rollBack(); 
     }
   }  
 </programlisting>

@@ -707,7 +709,7 @@
     </para>
 
     <para>
-      [Find the code <ulink url="code.tar">here</ulink>.]
+      [Find the code <ulink url="code.tar">here</ulink>. ]
     </para>
 
   </section>