Author: paul
Date: 2010-09-29 17:32:22 +0200 (Wed, 29 Sep 2010)
New Revision: 22904
Log:
r63612@frost: paul | 2010-09-29 10:27:59 -0500
MySQL Proxy: Incorporate feedback from Jan
Modified:
trunk/dynamic-docs/command-optvars/mysql-proxy.xml
trunk/dynamic-docs/faq/mysql-proxy.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:63607
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:63612
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-proxy.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql-proxy.xml 2010-09-29 15:00:43 UTC (rev 22903)
+++ trunk/dynamic-docs/command-optvars/mysql-proxy.xml 2010-09-29 15:32:22 UTC (rev 22904)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 3; 763 bytes
@@ -317,8 +317,7 @@
<name>proxy-fix-bug-25371</name>
<shortdescription>
- Enable the fix for Bug #25371 (for mysqld > 0.8.0.12) for older
- libmysql versions
+ Enable the fix for Bug #25371 for older libmysql versions
</shortdescription>
<types>
@@ -327,8 +326,8 @@
</types>
<versions>
- <introduced version="0.8.0"/>
<manual version="0.8"/>
+ <removed version="0.8.1"/>
</versions>
</mysqloption>
Modified: trunk/dynamic-docs/faq/mysql-proxy.xml
===================================================================
--- trunk/dynamic-docs/faq/mysql-proxy.xml 2010-09-29 15:00:43 UTC (rev 22903)
+++ trunk/dynamic-docs/faq/mysql-proxy.xml 2010-09-29 15:32:22 UTC (rev 22904)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 581 bytes
@@ -277,8 +277,8 @@
<para>
Lua is fast and the overhead should be small enough for most
- applications. The raw packet overhead is around 400
- microseconds.
+ applications. The raw packet overhead is around 400 microseconds
+ per request.
</para>
</faqanswer>
Modified: trunk/refman-common/mysql-proxy-core.xml
===================================================================
--- trunk/refman-common/mysql-proxy-core.xml 2010-09-29 15:00:43 UTC (rev 22903)
+++ trunk/refman-common/mysql-proxy-core.xml 2010-09-29 15:32:22 UTC (rev 22904)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 4; 2187 bytes
@@ -826,7 +826,9 @@
<para condition="dynamic:optvar:item" role="0.8:mysql-proxy:log-file"/>
<para>
- The name of a file to be used to record log information.
+ The name of a file to use to record log information. If this
+ option is not given, <command>mysql-proxy</command> logs to
+ the standard error output.
</para>
</listitem>
@@ -1074,7 +1076,7 @@
<listitem>
<para id="option_mysql-proxy_proxy-fix-bug-25371">
- <option>--proxy-fix-bug-25371</option>
+ <option role="mysql-proxy">--proxy-fix-bug-25371</option>
</para>
<para condition="dynamic:optvar:item" role="0.8:mysql-proxy:proxy-fix-bug-25371"/>
@@ -1084,6 +1086,14 @@
server later than 5.1.12 when using a MySQL client library of
any earlier version.
</para>
+
+ <para>
+ This option was removed in <command>mysql-proxy</command>
+ 0.8.1. Now, <command>mysql-proxy</command> returns an error
+ message at the protocol level if it sees a
+ <literal>COM_CHANGE_USER</literal> being sent to a server that
+ has a version from 5.1.14 to 5.1.17.
+ </para>
</listitem>
<listitem>
@@ -2930,14 +2940,16 @@
<listitem>
<para>
<literal>query_time</literal>: The number of microseconds
- required to receive the first row of a result set.
+ required to receive the first row of a result set since the
+ query was sent to the server.
</para>
</listitem>
<listitem>
<para>
<literal>response_time</literal>: The number of microseconds
- required to receive the last row of the result set.
+ required to receive the last row of the result set since the
+ query was sent to the server.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22904 - in trunk: . dynamic-docs/command-optvars dynamic-docs/faq refman-common | paul.dubois | 29 Sep |
