svn commit - mysqldoc@docsrva: r9054 - in trunk: . dynamic-docs/changelog dynamic-docs/opsfunctions refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2007-12-01 19:50:05 +0100 (Sat, 01 Dec 2007)
New Revision: 9054

Log:
 r27659@frost:  paul | 2007-12-01 12:45:30 -0600
 Various markup fixups.


Modified:
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/dynamic-docs/opsfunctions/opfunctions.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-6.0/partitioning.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33675
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27658
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33675
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27659
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2007-12-01 18:49:51 UTC (rev 9053)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2007-12-01 18:50:05 UTC (rev 9054)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 10; 2937 bytes

@@ -76620,8 +76620,8 @@
         <function role="sqlop" condition="operator_bitwise-or">|</function>,
         <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,
         <function role="sqlop" condition="operator_bitwise-xor">^</function>,
-        <function role="sqlop" condition="operator_bitwise-left-shift">&lt;&lt;</function>,
-        <function role="sqlop" condition="operator_bitwise-right-shift">&gt;&gt;</function>,
+        <function role="sqlop" condition="operator_left-shift">&lt;&lt;</function>,
+        <function role="sqlop" condition="operator_right-shift">&gt;&gt;</function>,
         and
         <function role="sqlop" condition="operator_bitwise-invert">~</function>.
       </para>

@@ -113870,8 +113870,8 @@
             <function role="sqlop" condition="operator_bitwise-or">|</function>,
             <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,
             <function role="sqlop" condition="operator_bitwise-xor">^</function>,
-            <function role="sqlop" condition="operator_bitwise-left-shift">&lt;&lt;</function>,
-            <function role="sqlop" condition="operator_bitwise-right-shift">&gt;&gt;</function>,
+            <function role="sqlop" condition="operator_left-shift">&lt;&lt;</function>,
+            <function role="sqlop" condition="operator_right-shift">&gt;&gt;</function>,
             and
             <function role="sqlop" condition="operator_bitwise-invert">~</function>.
           </para>

@@ -120719,8 +120719,8 @@
   <logentry entrytype="bug">
 
     <tags>
-      <manual type="STR_TO_TIME"/>
-      <manual type="STR_TO_DATE"/>
+      <manual type="STR_TO_TIME()"/>
+      <manual type="STR_TO_DATE()"/>
     </tags>
 
     <bugs>

@@ -120736,7 +120736,7 @@
       <para>
         <function role="sql">STR_TO_DATE()</function> displayed an error
         message that referred to
-        <function role="sql">STR_TO_TIME()</function>.
+        <function>STR_TO_TIME()</function>.
       </para>
 
     </message>

@@ -126270,9 +126270,9 @@
   <logentry entrytype="bug">
 
     <tags>
-      <manual type="CURRENT_TIME"/>
+      <manual type="CURRENT_TIME()"/>
       <manual type="replication"/>
-      <manual type="NOW"/>
+      <manual type="NOW()"/>
       <manual type="triggers"/>
     </tags>
 

@@ -126288,7 +126288,7 @@
 
       <para>
         <function role="sql">NOW()</function>,
-        <function role="sql">CURRENT_TIME</function> and values
+        <function role="sql">CURRENT_TIME()</function> and values
         generated by timestamp columns are now constant for the duration
         of a stored function or trigger. This prevents the breaking of
         statements-based replication.


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-12-01 18:49:51 UTC (rev 9053)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-12-01 18:50:05 UTC (rev 9054)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 574 bytes

@@ -4232,7 +4232,7 @@
     </versions>
   </opfunction>
   
-  <opfunction type="operator" id="tilde" class="other-bit">
+  <opfunction type="operator" id="bitwise-invert" class="other-bit">
     <display>~</display>
     <description lang="en">Invert bits</description>
     <versions>


Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2007-12-01 18:49:51 UTC (rev 9053)
+++ trunk/refman-5.1/partitioning.xml	2007-12-01 18:50:05 UTC (rev 9054)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1033 bytes

@@ -4402,8 +4402,8 @@
           <function role="sqlop" condition="operator_bitwise-or">|</function>,
           <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,
           <function role="sqlop" condition="operator_bitwise-xor">^</function>,
-          <function role="sqlop" condition="operator_bitwise-left-shift">&lt;&lt;</function>,
-          <function role="sqlop" condition="operator_bitwise-right-shift">&gt;&gt;</function>,
+          <function role="sqlop" condition="operator_left-shift">&lt;&lt;</function>,
+          <function role="sqlop" condition="operator_right-shift">&gt;&gt;</function>,
           and
           <function role="sqlop" condition="operator_bitwise-invert">~</function>
           are not permitted in partitioning expressions.


Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml	2007-12-01 18:49:51 UTC (rev 9053)
+++ trunk/refman-6.0/partitioning.xml	2007-12-01 18:50:05 UTC (rev 9054)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1033 bytes

@@ -4302,8 +4302,8 @@
           <function role="sqlop" condition="operator_bitwise-or">|</function>,
           <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,
           <function role="sqlop" condition="operator_bitwise-xor">^</function>,
-          <function role="sqlop" condition="operator_bitwise-left-shift">&lt;&lt;</function>,
-          <function role="sqlop" condition="operator_bitwise-right-shift">&gt;&gt;</function>,
+          <function role="sqlop" condition="operator_left-shift">&lt;&lt;</function>,
+          <function role="sqlop" condition="operator_right-shift">&gt;&gt;</function>,
           and
           <function role="sqlop" condition="operator_bitwise-invert">~</function>
           are not permitted in partitioning expressions.