Author: paul
Date: 2007-03-23 18:50:59 +0100 (Fri, 23 Mar 2007)
New Revision: 5532
Log:
r22153@polar: paul | 2007-03-23 12:50:26 -0500
Reformat.
Modified:
trunk/refman-4.1/apis-c.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/functions.xml
trunk/refman-4.1/problems.xml
trunk/refman-4.1/restrictions.xml
trunk/refman-4.1/tutorial.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22151
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18127
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22153
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18127
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/apis-c.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 685 bytes
@@ -8515,8 +8515,8 @@
<literal>unsigned</literal>, you should also set the
<literal>is_unsigned</literal> member to true. The table shows the
C variable types that you can use, the corresponding type codes,
- and the SQL data types for which the supplied value can be
- used without conversion.
+ and the SQL data types for which the supplied value can be used
+ without conversion.
</para>
<informaltable>
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/client-utility-programs.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 21; 2752 bytes
@@ -5892,49 +5892,45 @@
<refsection id="batch-commands">
<title>Executing SQL Statements from a Text File</title>
-
+
<indexterm>
<primary>executing SQL statements from text files</primary>
</indexterm>
-
+
<indexterm>
<primary>importing</primary>
<secondary>data</secondary>
</indexterm>
-
+
<indexterm>
<primary>data</primary>
<secondary>importing</secondary>
</indexterm>
-
+
<indexterm>
<primary>files</primary>
<secondary>text</secondary>
</indexterm>
-
+
<indexterm>
<primary>text files</primary>
<secondary>importing</secondary>
</indexterm>
-
+
<indexterm>
<primary>mysql source (command for reading from text files)</primary>
</indexterm>
-
+
<indexterm>
<primary>mysql \. (command for reading from text files)</primary>
</indexterm>
-
+
<indexterm>
- <primary>
- source (mysql client command)
- </primary>
+ <primary>source (mysql client command)</primary>
</indexterm>
-
+
<indexterm>
- <primary>
- \. (mysql client command)
- </primary>
+ <primary>\. (mysql client command)</primary>
</indexterm>
<para>
@@ -5969,12 +5965,11 @@
<programlisting>
shell> <userinput>mysql < text_file</userinput>
</programlisting>
-
+
<para>
If you are already running <command>mysql</command>, you can
- execute an SQL script file using the
- <literal>source</literal> command or <literal>\.</literal>
- command:
+ execute an SQL script file using the <literal>source</literal>
+ command or <literal>\.</literal> command:
</para>
<programlisting>
@@ -13852,8 +13847,8 @@
<replaceable>options</replaceable> should be either
<option>--help</option> to display the help message, or
options that indicate how to connect to the MySQL server. The
- account used when you connect determines which permissions
- you have when attempting to modify existing permissions in the
+ account used when you connect determines which permissions you
+ have when attempting to modify existing permissions in the
grant tables.
</para>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/data-types.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1584 bytes
@@ -1262,8 +1262,8 @@
<para>
The <literal>CHARACTER SET</literal> attribute specifies
the character set, and the <literal>COLLATE</literal>
- attribute specifies a collation for the character
- set. For example:
+ attribute specifies a collation for the character set.
+ For example:
</para>
<programlisting>
@@ -3697,7 +3697,7 @@
INSERT INTO t1 VALUES (NOW());
INSERT INTO t2 VALUES (CURRENT_TIMESTAMP);
</programlisting>
-
+
<para>
Note that, in MySQL 4.1 and later,
<literal>TIMESTAMP</literal> columns are <literal>NOT
@@ -5327,15 +5327,15 @@
<literal>NDB</literal>. This hidden primary key consumes 31-35
bytes per table record.
</para>
-
+
<para>
You may also find the <filename>ndb_size.pl</filename> utility to
be useful in such cases. This Perl script connects to a current
MySQL (non-Cluster) database and creates a report on how much
space that database would require if it used the
- <literal>NDBCluster</literal> storage engine. See
+ <literal>NDBCluster</literal> storage engine. See
<xref linkend="mysql-cluster-utilities-ndb-size"/>, for more
- information.
+ information.
</para>
<indexterm>
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/functions.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2442 bytes
@@ -2388,15 +2388,16 @@
<para>
Returns a string such that for every bit set in the value
<replaceable>bits</replaceable>, you get an
- <replaceable>on</replaceable> string and for every bit not set in the value,
- you get an <replaceable>off</replaceable> string. Bits in
- <replaceable>bits</replaceable> are examined from right to
- left (from low-order to high-order bits). Strings are added to
- the result from left to right, separated by the
- <replaceable>separator</replaceable> string (the default being
- the comma character ‘<literal>,</literal>’). The
- number of bits examined is given by
- <replaceable>number_of_bits</replaceable> (defaults to 64).
+ <replaceable>on</replaceable> string and for every bit not set
+ in the value, you get an <replaceable>off</replaceable>
+ string. Bits in <replaceable>bits</replaceable> are examined
+ from right to left (from low-order to high-order bits).
+ Strings are added to the result from left to right, separated
+ by the <replaceable>separator</replaceable> string (the
+ default being the comma character
+ ‘<literal>,</literal>’). The number of bits
+ examined is given by <replaceable>number_of_bits</replaceable>
+ (defaults to 64).
</para>
<remark role="help-description-end"/>
@@ -15048,10 +15049,10 @@
<para>
The <literal>SUM()</literal> and <literal>AVG()</literal>
aggregate functions do not work with temporal values. (They
- convert the values to numbers, losing everything after the
- first non-numeric character.) To work around this problem, you
- can convert to numeric units, perform the aggregate operation,
- and convert back to a temporal value. Examples:
+ convert the values to numbers, losing everything after the first
+ non-numeric character.) To work around this problem, you can
+ convert to numeric units, perform the aggregate operation, and
+ convert back to a temporal value. Examples:
</para>
<programlisting>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/problems.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 691 bytes
@@ -1170,9 +1170,8 @@
<para>
Another networking issue that can cause this error occurs if
- the MySQL port (default 3306) is blocked by your
- firewall, thus preventing any connections at all to the
- MySQL server.
+ the MySQL port (default 3306) is blocked by your firewall,
+ thus preventing any connections at all to the MySQL server.
</para>
</listitem>
Modified: trunk/refman-4.1/restrictions.xml
===================================================================
--- trunk/refman-4.1/restrictions.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/restrictions.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 700 bytes
@@ -370,8 +370,8 @@
<literal>= ANY</literal>, <literal><> ANY</literal>,
<literal>= ALL</literal>, and <literal><> ALL</literal>
with non-correlated subqueries, use an in-memory hash for a
- result or a temporary table with an index for larger
- results. Example:
+ result or a temporary table with an index for larger results.
+ Example:
</para>
<programlisting>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2007-03-23 17:41:36 UTC (rev 5531)
+++ trunk/refman-4.1/tutorial.xml 2007-03-23 17:50:59 UTC (rev 5532)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 12; 1452 bytes
@@ -2910,7 +2910,7 @@
<primary>files</primary>
<secondary>script</secondary>
</indexterm>
-
+
<indexterm>
<primary>executing SQL statements from text files</primary>
</indexterm>
@@ -3066,23 +3066,19 @@
use <literal>mysql -t</literal>. To echo to the output the
commands that are executed, use <literal>mysql -vvv</literal>.
</para>
-
+
<indexterm>
- <primary>
- source (mysql client command)
- </primary>
+ <primary>source (mysql client command)</primary>
</indexterm>
-
+
<indexterm>
- <primary>
- \. (mysql client command)
- </primary>
+ <primary>\. (mysql client command)</primary>
</indexterm>
-
+
<indexterm>
<primary>mysql source (command for reading from text files)</primary>
</indexterm>
-
+
<indexterm>
<primary>mysql \. (command for reading from text files)</primary>
</indexterm>
@@ -3097,7 +3093,7 @@
mysql> <userinput>source <replaceable>filename</replaceable>;</userinput>
mysql> <userinput>\. <replaceable>filename</replaceable></userinput>
</programlisting>
-
+
<para>
See <xref linkend="batch-commands"/>, for more information.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5532 - in trunk: . refman-4.1 | paul | 23 Mar |
