List:Commits« Previous MessageNext Message »
From:paul.dubois Date:September 28 2010 4:19pm
Subject:svn commit - mysqldoc@docsrva: r22887 - in trunk: . dynamic-docs/command-optvars refman-common
View as plain text  
Author: paul
Date: 2010-09-28 18:19:06 +0200 (Tue, 28 Sep 2010)
New Revision: 22887

Log:
 r63577@frost:  paul | 2010-09-28 11:18:31 -0500
 MySQL Proxy general edits
 Other misc dyndocs updates


Modified:
   trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml
   trunk/dynamic-docs/command-optvars/mysql-proxy.xml
   trunk/dynamic-docs/command-optvars/mysql.xml
   trunk/dynamic-docs/command-optvars/mysql_upgrade.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/dynamic-docs/command-optvars/mysqld_safe.xml
   trunk/dynamic-docs/command-optvars/ndb_common.xml
   trunk/refman-common/mysql-proxy-core.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:42410
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:63571
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:42410
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:63577
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysql-monitor-agent.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1609 bytes

@@ -245,8 +245,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--admin-lua-script"/>
-      <optype class="mycnf" format="admin-lua-script"/>
+      <optype class="cmdline" format="--admin-lua-script=file_name"/>
+      <optype class="mycnf" format="admin-lua-script=file_name"/>
     </types>
 
     <values vartype="filename" platform="all">

@@ -594,12 +594,12 @@
     <name>pid-file</name>
 
     <shortdescription>
-      PID file to store the process ID (when in daemon mode)
+      File in which to store the process ID (when in daemon mode)
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--pid-file"/>
-      <optype class="mycnf" format="pid-file"/>
+      <optype class="cmdline" format="--pid-file=file_name"/>
+      <optype class="mycnf" format="pid-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all"></values>

@@ -948,8 +948,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--monitor-lua-script"/>
-      <optype class="mycnf" format="monitor-lua-script"/>
+      <optype class="cmdline" format="--monitor-lua-script=file_name"/>
+      <optype class="mycnf" format="monitor-lua-script=file_name"/>
     </types>
 
     <values vartype="string" platform="all"></values>


Modified: trunk/dynamic-docs/command-optvars/mysql-proxy.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql-proxy.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysql-proxy.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 13; 2481 bytes

@@ -437,8 +437,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--defaults-file=file"/>
-      <optype class="mycnf" format="defaults-file=file"/>
+      <optype class="cmdline" format="--defaults-file=file_name"/>
     </types>
 
     <versions>

@@ -481,8 +480,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--user"/>
-      <optype class="mycnf" format="user"/>
+      <optype class="cmdline" format="--user=user_name"/>
+      <optype class="mycnf" format="user=user_name"/>
     </types>
 
     <values vartype="string" platform="all"></values>

@@ -505,8 +504,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--basedir=dir"/>
-      <optype class="mycnf" format="basedir=dir"/>
+      <optype class="cmdline" format="--basedir=path"/>
+      <optype class="mycnf" format="basedir=path"/>
     </types>
 
     <values vartype="filename" platform="all"></values>

@@ -525,12 +524,12 @@
     <name>pid-file</name>
 
     <shortdescription>
-      File in which to store the process ID (when in daemon mode)
+      File in which to store the process ID
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--pid-file=file"/>
-      <optype class="mycnf" format="pid-file=file"/>
+      <optype class="cmdline" format="--pid-file=file_name"/>
+      <optype class="mycnf" format="pid-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all"></values>

@@ -553,8 +552,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--plugin-dir=dir"/>
-      <optype class="mycnf" format="plugin-dir=dir"/>
+      <optype class="cmdline" format="--plugin-dir=path"/>
+      <optype class="mycnf" format="plugin-dir=path"/>
     </types>
 
     <values vartype="filename" platform="all"></values>

@@ -631,8 +630,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--log-file=filename"/>
-      <optype class="mycnf" format="log-file=filename"/>
+      <optype class="cmdline" format="--log-file=file_name"/>
+      <optype class="mycnf" format="log-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all"></values>


Modified: trunk/dynamic-docs/command-optvars/mysql.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysql.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 523 bytes

@@ -140,7 +140,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--character-sets-dir=name"/>
+      <optype class="cmdline" format="--character-sets-dir=path"/>
       <optype class="mycnf"/>
     </types>
 


Modified: trunk/dynamic-docs/command-optvars/mysql_upgrade.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql_upgrade.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysql_upgrade.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1053 bytes

@@ -80,7 +80,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--character-sets-dir=name"/>
+      <optype class="cmdline" format="--character-sets-dir=path"/>
       <optype class="mycnf"/>
     </types>
 

@@ -135,7 +135,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--datadir=name"/>
+      <optype class="cmdline" format="--datadir=path"/>
       <optype class="cmdline" format="-d"/>
       <optype class="mycnf"/>
     </types>

@@ -428,7 +428,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--tmpdir=name"/>
+      <optype class="cmdline" format="--tmpdir=path"/>
       <optype class="cmdline" format="-t"/>
       <optype class="mycnf"/>
     </types>


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 21, Lines Added: 30, Lines Deleted: 30; 8108 bytes

@@ -8336,7 +8336,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--backupdir=name" setvar="backupdir"/>
+      <optype class="cmdline" format="--backupdir=path" setvar="backupdir"/>
       <optype class="mycnf" format="backupdir" setvar="backupdir"/>
       <vartype class="system" isdynamic="yes" scope="global" format="backupdir"/>
     </types>

@@ -8364,7 +8364,7 @@
     <seealso xref="datadir"/>
 
     <types>
-      <optype class="cmdline" format="--basedir=name" setvar="basedir"/>
+      <optype class="cmdline" format="--basedir=path" setvar="basedir"/>
       <optype class="cmdline" format="-b" setvar="basedir"/>
       <optype class="mycnf" format="basedir" setvar="basedir"/>
       <vartype class="system" isdynamic="no" scope="global" format="basedir"/>

@@ -8575,9 +8575,9 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--bdb-tmpdir=name" outversion="5.1.12"
+      <optype class="cmdline" format="--bdb-tmpdir=path" outversion="5.1.12"
         setvar="bdb_tmpdir"/>
-      <optype class="mycnf" format="bdb-tmpdir=name" outversion="5.1.12"/>
+      <optype class="mycnf" format="bdb-tmpdir=path" outversion="5.1.12"/>
       <vartype class="system" scope="global" outversion="5.1.12" isdynamic="no"/>
     </types>
 

@@ -8726,7 +8726,7 @@
 
     <types>
       <optype class="cmdline" format="--bind-address=name"/>
-      <optype class="mycnf"/>
+      <optype class="mycnf" format="bind-address=name"/>
     </types>
 
     <values vartype="string" platform="all">

@@ -8896,8 +8896,8 @@
     <seealso xref="innodb_locks_unsafe_for_binlog"/>
 
     <types>
-      <optype class="mycnf" format="binlog-format" setvar="binlog_format"/>
-      <optype class="cmdline" format="--binlog-format" />
+      <optype class="mycnf" format="binlog-format=format" setvar="binlog_format"/>
+      <optype class="cmdline" format="--binlog-format=format" />
       <vartype class="system" isdynamic="yes" scope="both" inversion="5.1.8" format="binlog_format"/>
     </types>
 

@@ -9170,8 +9170,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--character-sets-dir=name" setvar="character_sets_dir"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--character-sets-dir=path" setvar="character_sets_dir"/>
+      <optype class="mycnf" format="character-sets-dir=path"/>
       <vartype class="system" scope="global"  isdynamic="no"/>
     </types>
 

@@ -9714,7 +9714,7 @@
     <seealso xref="basedir"/>
 
     <types>
-      <optype class="cmdline" format="--datadir=name" setvar="datadir"/>
+      <optype class="cmdline" format="--datadir=path" setvar="datadir"/>
       <optype class="cmdline" format="-h" setvar="datadir"/>
       <optype class="mycnf" format="datadir" setvar="datadir"/>
       <vartype class="system" scope="global" isdynamic="no"/>

@@ -10087,7 +10087,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--defaults-extra-file=name"/>
+      <optype class="cmdline" format="--defaults-extra-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all"/>

@@ -10147,7 +10147,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--defaults-file=name"/>
+      <optype class="cmdline" format="--defaults-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all"/>

@@ -10344,8 +10344,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--des-key-file=name" />
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--des-key-file=file_name" />
+      <optype class="mycnf" format="des-key-file=file_name" />
     </types>
 
     <versions>

@@ -10945,8 +10945,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--ft_stopword_file=name" setvar="ft_stopword_file"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--ft_stopword_file=file_name" setvar="ft_stopword_file"/>
+      <optype class="mycnf" format="ft_stopword_file=file_name"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
 

@@ -11256,8 +11256,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--init-file=name" setvar="init_file"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--init-file=file_name" setvar="init_file"/>
+      <optype class="mycnf" format="init-file=file_name"/>
       <vartype class="system" scope="global"  isdynamic="no" format="init_file"/>
     </types>
 

@@ -11865,7 +11865,7 @@
     <seealso xref="innodb_data_file_path"/>
 
     <types>
-      <optype class="cmdline" format="--innodb_data_home_dir=name" setvar="innodb_data_home_dir"/>
+      <optype class="cmdline" format="--innodb_data_home_dir=path" setvar="innodb_data_home_dir"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>

@@ -12419,7 +12419,7 @@
     <deprecated version="5.0.24"/>
 
     <types>
-      <optype class="cmdline" format="--innodb_log_arch_dir=name" setvar="innodb_log_arch_dir"/>
+      <optype class="cmdline" format="--innodb_log_arch_dir=path" setvar="innodb_log_arch_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -12639,7 +12639,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--innodb_log_group_home_dir=name"
+      <optype class="cmdline" format="--innodb_log_group_home_dir=path"
         setvar="innodb_log_group_home_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>

@@ -15257,8 +15257,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--master-info-file=name"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--master-info-file=file_name"/>
+      <optype class="mycnf" format="master-info-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all">

@@ -19461,8 +19461,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--pid-file=name" setvar="pid_file"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--pid-file=file_name" setvar="pid_file"/>
+      <optype class="mycnf" format="pid-file=file_name"/>
       <vartype isdynamic="no" scope="global" class="system" format="pid_file"/>
     </types>
 

@@ -19523,7 +19523,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--plugin_dir=name" setvar="plugin_dir"/>
+      <optype class="cmdline" format="--plugin_dir=path" setvar="plugin_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no"  scope="global" class="system"/>
     </types>

@@ -20286,8 +20286,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--relay-log-info-file=name" setvar="relay_log_info_file"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--relay-log-info-file=file_name" setvar="relay_log_info_file"/>
+      <optype class="mycnf" format="relay-log-info-file=file_name"/>
     </types>
 
     <values vartype="filename" platform="all">

@@ -22064,7 +22064,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--slave-load-tmpdir=name" setvar="slave_load_tmpdir"/>
+      <optype class="cmdline" format="--slave-load-tmpdir=path" setvar="slave_load_tmpdir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system" format="slave_load_tmpdir"/>
     </types>

@@ -24188,7 +24188,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--tmpdir=name" setvar="tmpdir"/>
+      <optype class="cmdline" format="--tmpdir=path" setvar="tmpdir"/>
       <optype class="cmdline" format="-t" setvar="tmpdir"/>
       <optype class="mycnf" format="tmpdir" setvar="tmpdir"/>
       <vartype isdynamic="no" scope="global" class="system"/>


Modified: trunk/dynamic-docs/command-optvars/mysqld_safe.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld_safe.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/mysqld_safe.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 625 bytes

@@ -508,8 +508,8 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--pid-file"/>
-      <optype class="mycnf"/>
+      <optype class="cmdline" format="--pid-file=file_name"/>
+      <optype class="mycnf" format="pid-file=file_name"/>
     </types>
 
     <values vartype="string" platform="all"/>


Modified: trunk/dynamic-docs/command-optvars/ndb_common.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/ndb_common.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/dynamic-docs/command-optvars/ndb_common.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 555 bytes

@@ -181,7 +181,7 @@
     </shortdescription>
 
     <types>
-      <optype class="cmdline" format="--character-sets-dir=name"/>
+      <optype class="cmdline" format="--character-sets-dir=path"/>
     </types>
 
     <values vartype="filename" platform="all">


Modified: trunk/refman-common/mysql-proxy-core.xml
===================================================================
--- trunk/refman-common/mysql-proxy-core.xml	2010-09-28 15:43:59 UTC (rev 22886)
+++ trunk/refman-common/mysql-proxy-core.xml	2010-09-28 16:19:06 UTC (rev 22887)
Changed blocks: 14, Lines Added: 27, Lines Deleted: 22; 6157 bytes

@@ -668,7 +668,7 @@
 
       <listitem>
         <para id="option_mysql-proxy_admin-lua-script">
-          <literal>--admin-lua-script=<replaceable>script</replaceable></literal>
+          <literal>--admin-lua-script=<replaceable>file_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:admin-lua-script"/>

@@ -713,7 +713,7 @@
 
       <listitem>
         <para id="option_mysql-proxy_basedir">
-          <literal>--basedir=<replaceable>dir</replaceable></literal>
+          <literal>--basedir=<replaceable>path</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:basedir"/>

@@ -729,7 +729,7 @@
 
       <listitem>
         <para id="option_mysql-proxy_defaults-file">
-          <literal>--defaults-file=<replaceable>file</replaceable></literal>
+          <literal>--defaults-file=<replaceable>file_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:defaults-file"/>

@@ -792,7 +792,7 @@
 
       <listitem>
         <para id="option_mysql-proxy_log-file">
-          <literal>--log-file=<replaceable>filename</replaceable></literal>
+          <literal>--log-file=<replaceable>file_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:log-file"/>

@@ -885,7 +885,7 @@
 
       <listitem>
         <para id="option_mysql-proxy_plugin-dir">
-          <literal>--plugin-dir=<replaceable>dir</replaceable></literal>
+          <literal>--plugin-dir=<replaceable>path</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:plugin-dir"/>

@@ -1030,7 +1030,7 @@
           <literal>--proxy-skip-profiling </literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:proxy-skip"/>
+        <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:proxy-skip-profiling"/>
 
         <para>
           Disables profiling of queries (tracking time statistics). The

@@ -1046,15 +1046,15 @@
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:proxy-fix-bug-25371"/>
 
         <para>
-          Gets round an issue when connecting to a MySQL server later
-          than 5.1.12 when using a MySQL client library of any earlier
-          version.
+          Enables a workaround for an issue when connecting to a MySQL
+          server later than 5.1.12 when using a MySQL client library of
+          any earlier version.
         </para>
       </listitem>
 
       <listitem>
         <para id="option_mysql-proxy_proxy-lua-script">
-          <literal>--proxy-lua-script=file </literal>
+          <literal>--proxy-lua-script=<replaceable>file_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:proxy-lua-script"/>

@@ -1084,20 +1084,19 @@
 
       <listitem>
         <para id="option_mysql-proxy_pid-file">
-          <literal>--pid-file=<replaceable>file</replaceable></literal>
+          <literal>--pid-file=<replaceable>file_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:pid-file"/>
 
         <para>
-          The name of the file in which to store the process ID when
-          <command>mysql-proxy</command> runs in daemon mode.
+          The name of the file in which to store the process ID.
         </para>
       </listitem>
 
       <listitem>
         <para id="option_mysql-proxy_user">
-          <literal>--user=user</literal>
+          <literal>--user=<replaceable>user_name</replaceable></literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="0.8:mysql-proxy:user"/>

@@ -1152,7 +1151,7 @@
 
 <programlisting>
 shell&gt; mysql --host=localhost --port=4040 \
-   --user=username --password=password
+   --user=user_name --password=password
 </programlisting>
 
     <para>

@@ -3039,7 +3038,8 @@
       <command>mysql-proxy</command>:
     </para>
 
-<programlisting>network-mysqld.c.367: connect(nostromo:3306) failed: Connection refused
+<programlisting>
+network-mysqld.c.367: connect(nostromo:3306) failed: Connection refused
 network-mysqld-proxy.c.2405: connecting to backend (nostromo:3306) failed, marking it as down for ...
 </programlisting>
 

@@ -3051,7 +3051,9 @@
       <option>--proxy-lua-script</option> option:
     </para>
 
-<programlisting>shell&gt; mysql-proxy --proxy-lua-script=mc.lua --proxy-backend-addresses=sakila:3306</programlisting>
+<programlisting>
+shell&gt; mysql-proxy --proxy-lua-script=mc.lua --proxy-backend-addresses=sakila:3306
+</programlisting>
 
     <para>
       When you specify a script, the script is not executed until a

@@ -3462,14 +3464,15 @@
         proxy:
       </para>
 
-<programlisting>shell&gt; mysql --user=root --password=password --port=4040
+<programlisting>
+shell&gt; mysql --user=root --password=password --port=4040
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 1798669
 Server version: 5.0.70-log Gentoo Linux mysql-5.0.70-r1
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
-mysql> 
+mysql&gt; 
 </programlisting>
 
       <para>

@@ -3478,14 +3481,15 @@
         user name and password:
       </para>
 
-<programlisting>shell&gt; mysql --user=root --password=password --port=4041 --host=localhost
+<programlisting>
+shell&gt; mysql --user=root --password=password --port=4041 --host=localhost
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 1
 Server version: 5.0.99-agent-admin
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
-mysql>
+mysql&gt;
 </programlisting>
 
       <para>

@@ -3501,7 +3505,8 @@
 +---------+---------------------+--------------------------+
 1 row in set (0.00 sec)
 
-mysql> </programlisting>
+mysql&gt;
+</programlisting>
 
       <para>
         For more information on the example, see


Thread
svn commit - mysqldoc@docsrva: r22887 - in trunk: . dynamic-docs/command-optvars refman-commonpaul.dubois28 Sep