Author: paul
Date: 2009-10-13 21:00:52 +0200 (Tue, 13 Oct 2009)
New Revision: 17120
Log:
r45481@frost: paul | 2009-10-13 14:00:42 -0500
5.4 does not have LOAD XML
Removed:
0 Skipped: 0 Warnings: 0
0 Skipped: 0 Warnings: 0
0 Skipped: 0 Warnings: 0
0 Skipped: 0 Warnings: 0
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.4/Notes
trunk/refman-5.4/introduction.xml
trunk/refman-5.4/renamed-nodes.txt
trunk/refman-5.4/sql-syntax-data-manipulation.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27075
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:45478
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:27075
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:45481
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-10-13 18:50:17 UTC (rev 17119)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 419 bytes
@@ -5475,7 +5475,7 @@
</bugs>
<versions>
- <version ver="5.4.4"/>
+<!--<version ver="5.4.4"/>-->
</versions>
<message>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2009-10-13 18:50:17 UTC (rev 17119)
+++ trunk/refman-5.1/introduction.xml 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 557 bytes
@@ -753,6 +753,7 @@
</para>
</listitem>
+<!--
<listitem>
<para>
Enhancements to XML functionality, including a new
@@ -760,6 +761,7 @@
<xref linkend="load-xml"/>).
</para>
</listitem>
+-->
<listitem>
<para>
Modified: trunk/refman-5.4/Notes
===================================================================
--- trunk/refman-5.4/Notes 2009-10-13 18:50:17 UTC (rev 17119)
+++ trunk/refman-5.4/Notes 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 413 bytes
@@ -87,3 +87,4 @@
* DEBUG_SYNC: --enable-debug-sync, --debug-sync-timeout, debug_sync
* OUT parameters in prepared statements
* SIGNAL/RESIGNAL
+* Client character set autodetection (WL#1349)
Modified: trunk/refman-5.4/introduction.xml
===================================================================
--- trunk/refman-5.4/introduction.xml 2009-10-13 18:50:17 UTC (rev 17119)
+++ trunk/refman-5.4/introduction.xml 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 17; 1359 bytes
@@ -472,15 +472,6 @@
<listitem>
<para>
- Optimizer enhancements for faster subqueries and joins,
- including batched index access of table rows for sequences
- of disjoint ranges by the <literal>MyISAM</literal> and
- <literal>InnoDB</literal> storage engines.
- </para>
- </listitem>
-
- <listitem>
- <para>
The syntax for the <literal role="stmt">LOCK
TABLES</literal> statement is extended to support
transactional table locks that do not commit transactions
@@ -509,14 +500,6 @@
<listitem>
<para>
- Enhancements to XML functionality, including a new
- <literal role="stmt">LOAD XML</literal> statement (see
- <xref linkend="load-xml"/>).
- </para>
- </listitem>
-
- <listitem>
- <para>
Support for an interface for semisynchronous replication: A
commit performed on the master side blocks before returning
to the session that performed the transaction until at least
Modified: trunk/refman-5.4/renamed-nodes.txt
===================================================================
--- trunk/refman-5.4/renamed-nodes.txt 2009-10-13 18:50:17 UTC (rev 17119)
+++ trunk/refman-5.4/renamed-nodes.txt 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 633 bytes
@@ -25,6 +25,7 @@
bnl-optimization optimization 2010-10-12
german-character-set charset-we-sets 2010-08-08
join-buffer-management optimization 2010-10-12
+load-xml load-data 2010-10-13
mem-query-analysis mem-query-analyzer 2010-08-01
mem-query-analysis-enabling mem-query-analyzer-enabling 2010-08-01
mem-query-analysis-enabling-app mem-query-analyzer-enabling-app 2010-08-01
Modified: trunk/refman-5.4/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-data-manipulation.xml 2009-10-13 18:50:17 UTC (rev 17119)
+++ trunk/refman-5.4/sql-syntax-data-manipulation.xml 2009-10-13 19:00:52 UTC (rev 17120)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 242; 8091 bytes
@@ -3481,610 +3481,6 @@
</section>
- <section id="load-xml">
-
- <title><literal role="stmt">LOAD XML</literal> Syntax</title>
-
- <indexterm>
- <primary>LOAD XML</primary>
- </indexterm>
-
- <remark role="help-topic" condition="LOAD XML"/>
-
- <remark role="help-keywords">
- LOW_PRIORITY CONCURRENT LOCAL INFILE REPLACE IGNORE CHARACTER SET
- ROWS IDENTIFIED BY LINES
- </remark>
-
- <remark role="help-syntax-begin"/>
-
-<programlisting>
-LOAD XML [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE '<replaceable>file_name</replaceable>'
-[REPLACE | IGNORE]
-INTO TABLE [<replaceable>db_name</replaceable>.]<replaceable>tbl_name</replaceable>
-[CHARACTER SET <replaceable>charset_name</replaceable>]
-[ROWS IDENTIFIED BY '<<replaceable>tagname</replaceable>>']
-[IGNORE <replaceable>number</replaceable> [LINES | ROWS]]
-[(<replaceable>column_or_user_var</replaceable>,...)]
-[SET <replaceable>col_name</replaceable> = <replaceable>expr</replaceable>,...]
-</programlisting>
-
- <remark role="help-syntax-end"/>
-
- <remark role="help-description-begin"/>
-
- <para>
- The <literal role="stmt">LOAD XML</literal> statement reads data
- from an XML file into a table. It was added in MySQL 5.4.4. The
- <replaceable>file_name</replaceable> must be given as a literal
- string. The <replaceable>tagname</replaceable> in the optional
- <literal>ROWS IDENTIFIED BY</literal> clause must also be given as
- a literal string, and must be surrounded by angle brackets
- (<literal><</literal> and <literal>></literal>).
- </para>
-
- <para>
- <literal role="stmt">LOAD XML</literal> acts as the complement of
- running the <command>mysql</command> client in XML output mode
- (that is, starting the client with the
- <option role="mysql">--xml</option> option). To write data from a
- table to an XML file, use a command such as the following one from
- the system shell:
- </para>
-
-<programlisting>
-shell> <userinput>mysql --xml -e 'SELECT * FROM mytable' > file.xml</userinput>
-</programlisting>
-
- <para>
- To read the file back into a table, use
- <literal role="stmt" condition="load-xml">LOAD XML
- INFILE</literal>. By default, the <literal><row></literal>
- element is considered to be the equivalent of a database table
- row; this can be changed using the <literal>ROWS IDENTIFIED
- BY</literal> clause.
- </para>
-
- <para>
- This statement supports three different XML formats:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- Column names as attributes and column values as attribute
- values:
- </para>
-
-<programlisting>
-<<replaceable>row</replaceable> <replaceable>column1</replaceable>="<replaceable>value1</replaceable>" <replaceable>column2</replaceable>="<replaceable>value2</replaceable>" .../>
-</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Column names as tags and column values as the content of these
- tags:
- </para>
-
-<programlisting>
-<<replaceable>row</replaceable>>
- <<replaceable>column1</replaceable>><replaceable>value1</replaceable></<replaceable>column1</replaceable>>
- <<replaceable>column2</replaceable>><replaceable>value2</replaceable></<replaceable>column2</replaceable>>
-</<replaceable>row</replaceable>>
-</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Column names are the <literal>name</literal> attributes of
- <literal><field></literal> tags, and values are the
- contents of these tags:
- </para>
-
-<programlisting>
-<row>
- <field name='<replaceable>column1</replaceable>'><replaceable>value1</replaceable></field>
- <field name='<replaceable>column2</replaceable>'><replaceable>value2</replaceable></field>
-</row>
-</programlisting>
-
- <para>
- This is the format used by other MySQL tools, such as
- <command>mysqldump</command>.
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
- All 3 formats can be used in the same XML file; the import routine
- automatically detects the format for each row and interpets it
- correctly. Tags are matched based on the tag or attribute name and
- the column name.
- </para>
-
- <para>
- The following clauses work essentially the same way for
- <literal role="stmt">LOAD XML</literal> as they do for
- <literal role="stmt">LOAD DATA</literal>:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- <literal>LOW_PRIORITY</literal> or
- <literal>CONCURRENT</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>LOCAL</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal role="stmt">REPLACE</literal> or
- <literal>IGNORE</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>CHARACTER SET</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>(<replaceable>column_or_user_var</replaceable>,...)</literal>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <literal>SET</literal>
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
- See <xref linkend="load-data"/>, for more information about these
- clauses.
- </para>
-
- <para>
- The <literal>IGNORE <replaceable>number</replaceable>
- LINES</literal> or <literal>IGNORE
- <replaceable>number</replaceable> ROWS</literal> clause causes the
- first <replaceable>number</replaceable> rows in the XML file to be
- skipped. It is analogous to the <literal role="stmt">LOAD
- DATA</literal> statement's <literal>IGNORE ... LINES</literal>
- clause.
- </para>
-
- <remark role="help-description-end"/>
-
- <para>
- To illustrate how this statement is used, suppose that we have a
- table created as follows:
- </para>
-
-<programlisting>
-USE test;
-
-CREATE TABLE person (
- person_id INT NOT NULL PRIMARY KEY,
- fname VARCHAR(40) NULL,
- lname VARCHAR(40) NULL,
- created TIMESTAMP
-);
-</programlisting>
-
- <para>
- Suppose further that this table is initially empty.
- </para>
-
- <para>
- Now suppose we have a simple XML file
- <filename>person.xml</filename>, whose contents are as shown here:
- </para>
-
-<programlisting>
-<?xml version="1.0"?>
-<list>
- <person person_id="1" fname="Pekka" lname="Nousiainen"/>
- <person person_id="2" fname="Jonas" lname="Oreland"/>
- <person person_id="3"><fname>Mikael</fname><lname>Ronström</lname></person>
- <person person_id="4"><fname>Lars</fname><lname>Thalmann</lname></person>
- <person><field name="person_id">5</field><field name="fname">Tomas</field><field name="lname">Ulin</field></person>
- <person><field name="person_id">6</field><field name="fname">Martin</field><field name="lname">Sköld</field></person>
-</list>
-</programlisting>
-
- <para>
- Each of the allowable XML formats discussed previously is
- represented in this example file.
- </para>
-
- <para>
- To import the data in <filename>person.xml</filename> into the
- <literal>person</literal> table, you can use this statement:
- </para>
-
-<programlisting>
-mysql> <userinput>LOAD XML LOCAL INFILE 'person.xml'</userinput>
- -> <userinput>INTO TABLE person</userinput>
- -> <userinput>ROWS IDENTIFIED BY '<person>';</userinput>
-
-Query OK, 6 rows affected (0.00 sec)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17120 - in trunk: . dynamic-docs/changelog refman-5.1 refman-5.4 | paul.dubois | 13 Oct |
