Author: paul
Date: 2009-11-26 17:16:15 +0100 (Thu, 26 Nov 2009)
New Revision: 17844
Log:
r46934@frost: paul | 2009-11-26 09:42:49 -0500
Add some 5.6.0 changes (they're in the 5.5 manual for the moment)
Bug#8368 mysqldump
Bug#26780 mysql
Bug#5724 mysqladmin
Bug#10374 GET_LOCK()
Bug#33544 UDF
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysql.xml
trunk/dynamic-docs/command-optvars/mysqldump.xml
trunk/refman-5.5/Notes
trunk/refman-5.5/extending-mysql.xml
trunk/refman-5.5/functions-core.xml
trunk/refman-5.5/programs-client-core.xml
trunk/refman-6.0.sav/programs-client-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:28120
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
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:46907
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:28120
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
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:46934
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/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 4, Lines Added: 6, Lines Deleted: 1; 876 bytes
@@ -39246,6 +39246,7 @@
</bugs>
<versions>
+ <version ver="5.6.0"/>
<version ver="6.0.4"/>
</versions>
@@ -40056,6 +40057,7 @@
</bugs>
<versions>
+ <version ver="5.6.0"/>
<version ver="6.0.4"/>
</versions>
@@ -43356,7 +43358,8 @@
</bugs>
<versions>
- <version ver="5.4.4"/>
+<!--<version ver="5.4.4"/>-->
+ <version ver="5.6.0"/>
<version ver="6.0.6"/>
</versions>
@@ -68910,6 +68913,8 @@
<versions>
<!--<version ver="5.4.4"/>-->
+ <version ver="5.6.0"/>
+ <version ver="6.0.14"/>
</versions>
<message>
Modified: trunk/dynamic-docs/command-optvars/mysql.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/dynamic-docs/command-optvars/mysql.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 449 bytes
@@ -104,6 +104,7 @@
</types>
<versions>
+ <manual version="5.6"/>
<manual version="6.0"/>
<introduced version="6.0.4"/>
</versions>
Modified: trunk/dynamic-docs/command-optvars/mysqldump.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqldump.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/dynamic-docs/command-optvars/mysqldump.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 0; 786 bytes
@@ -244,6 +244,7 @@
</values>
<versions>
+ <manual version="5.6"/>
<manual version="6.0"/>
<introduced version="6.0.4"/>
</versions>
@@ -662,6 +663,7 @@
</values>
<versions>
+ <manual version="5.6"/>
<manual version="6.0"/>
<introduced version="6.0.4"/>
</versions>
@@ -1075,6 +1077,7 @@
</values>
<versions>
+ <manual version="5.6"/>
<manual version="6.0"/>
<introduced version="6.0.4"/>
</versions>
Modified: trunk/refman-5.5/Notes
===================================================================
--- trunk/refman-5.5/Notes 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/refman-5.5/Notes 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 0; 482 bytes
@@ -44,3 +44,13 @@
For index comments, don't I need to modify the syntax descriptions
for CREATE INDEX and CREATE TABLE?
+
+
+Additions to 5.5 manual that actually apply to 5.6.0:
+
+Bugs:
+#8368 mysqldump
+#26780 mysql
+#5724 mysqladmin
+#10374 GET_LOCK()
+#33544 UDF
Modified: trunk/refman-5.5/extending-mysql.xml
===================================================================
--- trunk/refman-5.5/extending-mysql.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/refman-5.5/extending-mysql.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 3; 1401 bytes
@@ -3370,7 +3370,10 @@
more than the maximum number of decimals allowed for the
<literal role="type">DECIMAL</literal>,
<literal role="type">FLOAT</literal>, and
- <literal role="type">DOUBLE</literal> data types.
+ <literal role="type">DOUBLE</literal> data types. As of
+ MySQL 5.6.0, this value is available as the constant
+ <literal>NOT_FIXED_DEC</literal> in the
+ <filename>mysql_com.h</filename> header file.
</para>
<para>
@@ -3392,8 +3395,9 @@
the function to reflect the actual calculation performed.
The default is determined such that the largest number of
decimals of the arguments is used. If the number of
- decimals is 31 for even one of the arguments, that is the
- value used for <literal>decimals</literal>.
+ decimals is <literal>NOT_FIXED_DEC</literal> for even one
+ of the arguments, that is the value used for
+ <literal>decimals</literal>.
</para>
</listitem>
Modified: trunk/refman-5.5/functions-core.xml
===================================================================
--- trunk/refman-5.5/functions-core.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/refman-5.5/functions-core.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 667 bytes
@@ -17334,7 +17334,7 @@
<note>
<para>
- Before MySQL 5.4.4, if a client attempts to acquire a lock
+ Before MySQL 5.6.0, if a client attempts to acquire a lock
that is already held by another client, it blocks
according to the <replaceable>timeout</replaceable>
argument. If the blocked client terminates, its thread
Modified: trunk/refman-5.5/programs-client-core.xml
===================================================================
--- trunk/refman-5.5/programs-client-core.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/refman-5.5/programs-client-core.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 5, Lines Added: 138, Lines Deleted: 0; 6673 bytes
@@ -225,6 +225,30 @@
</listitem>
<listitem>
+ <para id="option_mysql_auto-vertical-output">
+ <indexterm>
+ <primary>mysql</primary>
+ <secondary>auto-vertical-output option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>auto-vertical-output option</primary>
+ <secondary>mysql</secondary>
+ </indexterm>
+
+ <option role="mysql">--auto-vertical-output</option>
+ </para>
+
+ <para>
+ Cause result sets to be displayed vertically if they are too
+ wide for the current window, and using normal tabular format
+ otherwise. (This applies to statements terminated by
+ <literal>;</literal> or <literal>\G</literal>.) This option
+ was added in MySQL 5.6.0.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysql_batch">
<indexterm>
<primary>mysql</primary>
@@ -3494,6 +3518,17 @@
shell> <userinput>mysqladmin password "my new password"</userinput>
</programlisting>
+ <para>
+ As of MySQL 5.6.0, the new password can be omitted following
+ the <literal>password</literal> command. In this case,
+ <command>mysqladmin</command> prompts for the password
+ value, which enables you to avoid specifying the password on
+ the command line. Omitting the password value should be done
+ only if <literal>password</literal> is the final command on
+ the <command>mysqladmin</command> command line. Otherwise,
+ the next argument is taken as the password.
+ </para>
+
<caution>
<para>
Do not use this command used if the server was started
@@ -5923,6 +5958,32 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_apply-slave-statements">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>apply-slave-statements option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>apply-slave-statements option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option role="mysqldump">--apply-slave-statements</option>
+ </para>
+
+ <para>
+ For a slave dump produced with the
+ <option role="mysqldump">--dump-slave</option> option, add a
+ <literal role="stmt">STOP SLAVE</literal> statement before
+ the <literal role="stmt">CHANGE MASTER TO</literal>
+ statement and a <literal role="stmt">START SLAVE</literal>
+ statement at the end of the output. This option was added in
+ MySQL 5.6.0.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_character-sets-dir">
<indexterm>
<primary>mysqldump</primary>
@@ -6338,6 +6399,57 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_dump-slave">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>dump-slave option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>dump-slave option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option role="mysqldump">--dump-slave[=<replaceable>value</replaceable>]</option>
+ </para>
+
+ <para>
+ This option is similar to
+ <option role="mysqldump">--master-data</option> except that
+ it is used to dump a replication slave server to produce a
+ dump file that can be used to set up another server as a
+ slave that has the same master as the dumped server. It
+ causes the dump output to include a
+ <literal role="stmt">CHANGE MASTER TO</literal> statement
+ that indicates the binary log coordinates (file name and
+ position) of the dumped slave's master (rather than the
+ coordinates of the dumped server, as is done by the
+ <option role="mysqldump">--master-data</option> option).
+ These are the master server coordinates from which the slave
+ should start replicating. This option was added in MySQL
+ 5.6.0.
+ </para>
+
+ <para>
+ The option value is handled the same way as for
+ <option role="mysqldump">--master-data</option> and has the
+ same effect as
+ <option role="mysqldump">--master-data</option> in terms of
+ enabling or disabling other options and in how locking is
+ handled.
+ </para>
+
+ <para>
+ In conjunction with
+ <option role="mysqldump">--dump-slave</option>, the
+ <option role="mysqldump">--apply-slave-statements</option>
+ and
+ <option role="mysqldump">--include-master-host-port</option>
+ options can also be used.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_events">
<indexterm>
<primary>mysqldump</primary>
@@ -6609,6 +6721,32 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_include-master-host-port">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>include-master-host-port option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>include-master-host-port option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option role="mysqldump">--include-master-host-port</option>
+ </para>
+
+ <para>
+ For the <literal role="stmt">CHANGE MASTER TO</literal>
+ statement in a slave dump produced with the
+ <option role="mysqldump">--dump-slave</option> option, add
+ <literal>MASTER_PORT</literal> and
+ <literal>MASTER_PORT</literal> options for the host name and
+ TCP/IP port number of the slave's master. This option was
+ added in MySQL 5.6.0.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_ignore-table">
<indexterm>
<primary>mysqldump</primary>
Modified: trunk/refman-6.0.sav/programs-client-core.xml
===================================================================
--- trunk/refman-6.0.sav/programs-client-core.xml 2009-11-26 15:57:47 UTC (rev 17843)
+++ trunk/refman-6.0.sav/programs-client-core.xml 2009-11-26 16:16:15 UTC (rev 17844)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 0; 1101 bytes
@@ -3515,6 +3515,17 @@
shell> <userinput>mysqladmin password "my new password"</userinput>
</programlisting>
+ <para>
+ As of MySQL 6.0.14, the new password can be omitted
+ following the <literal>password</literal> command. In this
+ case, <command>mysqladmin</command> prompts for the password
+ value, which enables you to avoid specifying the password on
+ the command line. Omitting the password value should be done
+ only if <literal>password</literal> is the final command on
+ the <command>mysqladmin</command> command line. Otherwise,
+ the next argument is taken as the password.
+ </para>
+
<caution>
<para>
Do not use this command used if the server was started
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17844 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-5.5 refman-6.0.sav | paul.dubois | 26 Nov |
