svn commit - mysqldoc@docsrva: r12720 - in trunk: . refman-5.1 refman-6.0

[paul.dubois]

Author: paul
Date: 2008-12-01 19:18:24 +0100 (Mon, 01 Dec 2008)
New Revision: 12720

Log:
 r36288@frost:  paul | 2008-12-01 12:19:38 -0500
 Fix docs bug:
 Bug#41070: SET SESSION binlog_format requires SUPER privilege


Modified:
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-6.0/dba-core.xml

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


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-12-01 18:07:14 UTC (rev 12719)
+++ trunk/refman-5.1/dba-core.xml	2008-12-01 18:18:24 UTC (rev 12720)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 863 bytes

@@ -15659,8 +15659,10 @@
           The logging format also can be switched at runtime. To specify
           the format globally for all clients, set the global value of
           the <literal role="sysvar">binlog_format</literal> system
-          variable. (To change a global variable you need the
-          <literal role="priv">SUPER</literal> privilege.)
+          variable. (To change the global value, you must have need the
+          <literal role="priv">SUPER</literal> privilege. This is also
+          true for the <literal>SESSION</literal> value as of MySQL
+          5.1.29.)
         </para>
 
         <para>


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2008-12-01 18:07:14 UTC (rev 12719)
+++ trunk/refman-5.1/replication-options-core.xml	2008-12-01 18:18:24 UTC (rev 12720)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 3; 1208 bytes

@@ -2396,9 +2396,11 @@
           <literal>MIXED</literal>.
           <literal role="sysvar">binlog_format</literal> is set by the
           <option>--binlog-format</option> option at startup, or by the
-          <literal role="sysvar">binlog_format</literal> variable at
-          runtime (you need the <literal role="priv">SUPER</literal>
-          privilege to set this variable on a global scope). See
+          <literal role="sysvar">binlog_format</literal> variable at at
+          runtime. You must have the
+          <literal role="priv">SUPER</literal> privilege to set this
+          variable, which is true (unlike most system variables) as of
+          MySQL 5.1.29 even for the session value. See
           <xref linkend="replication-formats"/>. The startup variable
           was added in MySQL 5.1.5, and the runtime variable in MySQL
           5.1.8. <literal>MIXED</literal> was added in MySQL 5.1.8.


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-12-01 18:07:14 UTC (rev 12719)
+++ trunk/refman-6.0/dba-core.xml	2008-12-01 18:18:24 UTC (rev 12720)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 4; 1493 bytes

@@ -4214,9 +4214,10 @@
             <literal role="sysvar">binlog_format</literal> is set by the
             <option>--binlog-format</option> option at startup, or by
             the <literal role="sysvar">binlog_format</literal> variable
-            at runtime (you need the
+            at runtime. You must have the
             <literal role="priv">SUPER</literal> privilege to set this
-            variable on a global scope). See
+            variable, which is true (unlike most system variables) as of
+            MySQL 6.0.8 even for the session value. See
             <xref linkend="replication-formats"/>.
           </para>
 

@@ -17247,8 +17248,10 @@
           The logging format also can be switched at runtime. To specify
           the format globally for all clients, set the global value of
           the <literal role="sysvar">binlog_format</literal> system
-          variable. (To change a global variable you need the
-          <literal role="priv">SUPER</literal> privilege.)
+          variable. (To change the global value, you must have need the
+          <literal role="priv">SUPER</literal> privilege. This is also
+          true for the <literal>SESSION</literal> value as of MySQL
+          6.0.8.)
         </para>
 
         <para>