svn commit - mysqldoc@docsrva: r4071 - trunk/refman-5.0

[mcbrown]

Author: mcbrown
Date: 2006-11-29 13:37:58 +0100 (Wed, 29 Nov 2006)
New Revision: 4071

Log:
Expanding info/fixes (from Stefan) for WL3516



Modified:
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/installing-version.xml


Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-11-29 10:17:58 UTC (rev 4070)
+++ trunk/refman-5.0/database-administration.xml	2006-11-29 12:37:58 UTC (rev 4071)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1449 bytes

@@ -6901,7 +6901,7 @@
           </listitem>
 
           <listitem>
-            <para>
+            <para id="optvar-variable_version">
               <literal>version</literal>
             </para>
 

@@ -6925,7 +6925,7 @@
           </listitem>
 
           <listitem>
-            <para>
+            <para id="optvar_version_comment">
               <literal>version_comment</literal>
             </para>
 

@@ -6940,8 +6940,9 @@
               <literal>version_comment</literal> will include the full server
               type and license. For community users this will appear as
               <literal>MySQL Community Edition - Standard (GPL)</literal>.
For
-              Enterprise users, <literal>MySQL Enterprise Server
-              (GPL)</literal>. For server compiled from source, the default
+              Enterprise users, the version might be displayed as <literal>MySQL
Enterprise Server
+              (GPL)</literal>. The corresponding license for your MySQL binary
+              is shown in parentheses. For server compiled from source, the default
               value will be the same as that for Community releases. 
               </para>
           </listitem>


Modified: trunk/refman-5.0/installing-version.xml
===================================================================
--- trunk/refman-5.0/installing-version.xml	2006-11-29 10:17:58 UTC (rev 4070)
+++ trunk/refman-5.0/installing-version.xml	2006-11-29 12:37:58 UTC (rev 4071)
Changed blocks: 5, Lines Added: 72, Lines Deleted: 23; 4533 bytes

@@ -11,7 +11,6 @@
 <!ENTITY % versions.entities    SYSTEM "versions.ent">
 %versions.entities;
 ]>
-
 <section id="installation-version">
 
   <title>Determining your current MySQL version</title>

@@ -21,19 +20,22 @@
     MySQL installation, there are a number of options.
   </para>
 
-  <para>
-    Using a command client (<literal>mysql</literal>), the server
-    version of the MySQL server that you are connected to will be shown
-    once you are connected. The server version information will include
-    <literal>community</literal> or <literal>enterprise</literal>
-    accordingly.
-  </para>
+  <itemizedlist>
 
-  <para>
-    For example, here is the output from a MySQL Community Server
-    edition installed on Linux:
-  </para>
+    <listitem>
+      <para>
+        Using a command client (<literal>mysql</literal>), the server
+        version of the MySQL server that you are connected to will be
+        shown once you are connected. The server version information
+        will include <literal>community</literal> or
+        <literal>enterprise</literal> accordingly.
+      </para>
 
+      <para>
+        For example, here is the output from a MySQL Community Server
+        edition installed on Linux:
+      </para>
+
 <programlisting>Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 6
 Server version: 5.0.27-standard MySQL Community Edition - Standard (GPL)

@@ -42,9 +44,9 @@
 
 mysql&gt;</programlisting>
 
-  <para>
-    Below is the output from MySQL Enterprise Server on Windows:
-  </para>
+      <para>
+        Below is the output from MySQL Enterprise Server on Windows:
+      </para>
 
 <programlisting>Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 2

@@ -53,15 +55,19 @@
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
 mysql&gt; </programlisting>
+    </listitem>
 
-  <para>
-    You may also determine the version information using the version
-    variables. Both the <literal>version</literal> and
-    <literal>version_comment</literal> variables contain version
-    information for the server you are connected to. Use the
-    <literal>SHOW VARIABLES</literal> statement to obtain the
-    information you want. For example:
-  </para>
+    <listitem>
+      <para>
+        You may also determine the version information using the version
+        variables. Both the
+        <link
+      linkend="optvar-variable_version">version</link> and
+        <link linkend="optvar_version_comment">version_comment</link>
+        variables contain version information for the server you are
+        connected to. Use the <literal>SHOW VARIABLES</literal>
+        statement to obtain the information you want. For example:
+      </para>
 
 <programlisting>mysql> show variables like "%version%";
 +-------------------------+------------------------------------------+

@@ -76,5 +82,48 @@
 5 rows in set (0.04 sec)
 
 mysql&gt; </programlisting>
+    </listitem>
 
+    <listitem>
+      <para>
+        The <literal>STATUS</literal> command will display the version
+        and version comment information. For example:
+      </para>
+
+<programlisting>mysql&gt; status;
+--------------
+./client/mysql  Ver 14.12 Distrib 5.0.29, for pc-linux-gnu (i686) using readline 5.0
+
+Connection id:          8
+Current database:
+Current user:           mc@localhost
+SSL:                    Not in use
+Current pager:          /usr/bin/less
+Using outfile:          ''
+Using delimiter:        ;
+Server version:         5.0.27-standard MySQL Community Edition - Standard (GPL)
+Protocol version:       10
+Connection:             Localhost via UNIX socket
+Server characterset:    latin1
+Db     characterset:    latin1
+Client characterset:    latin1
+Conn.  characterset:    latin1
+UNIX socket:            /tmp/mysql.sock
+Uptime:                 1 day 3 hours 58 min 43 sec
+
+Threads: 2  Questions: 17  Slow queries: 0  Opens: 11  Flush tables: 1  Open tables: 6 
Queries per second avg: 0.000
+--------------
+</programlisting>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Administrator will show the server version within the
+        <guilabel>Server Information</guilabel> tab. Only the value of
+        the <literal>version</literal> information is shown.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
 </section>