Author: paul
Date: 2006-02-19 00:32:17 +0100 (Sun, 19 Feb 2006)
New Revision: 1389
Log:
r7827@frost: paul | 2006-02-18 16:21:36 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/ndbcluster.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.1/ndbcluster.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7826
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3223
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7827
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3223
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-02-18 23:31:31 UTC (rev 1388)
+++ trunk/refman-4.1/ndbcluster.xml 2006-02-18 23:32:17 UTC (rev 1389)
@@ -1351,7 +1351,7 @@
<literal>NDB Cluster</literal> storage engine. To specify
this, use the <option>ENGINE=NDB</option> or
<option>ENGINE=NDBCLUSTER</option> table option. You can add
- this open when creating the table:
+ this option when creating the table:
</para>
<programlisting>
@@ -1389,7 +1389,7 @@
output of <command>mysqldump</command>, you can open the SQL
script in a text editor and add the <literal>ENGINE</literal>
option to any table creation statements, or replace any existing
- <literal>ENGINE</literal> (or <literal>TYPE</literal>) option.
+ <literal>ENGINE</literal> (or <literal>TYPE</literal>) options.
Suppose that you have the <literal>world</literal> sample
database on another MySQL server that does not support MySQL
Cluster, and you want to export the <literal>City</literal>
@@ -1430,7 +1430,8 @@
accomplished. One of these is to modify the table definition
<emphasis>before</emphasis> importing it into the Cluster
database. Using the <literal>City</literal> table as an example,
- the definition would be modified as follows:
+ modify the <literal>ENGINE</literal> option of the definition as
+ follows:
</para>
<programlisting>
@@ -1455,12 +1456,14 @@
part of the clustered database. The easiest way to accomplish
this is to do a search-and-replace on the file that contains the
definitions and replace all instances of
- <literal>TYPE=MyISAM</literal> or
- <literal>ENGINE=MyISAM</literal> with
- <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
+ <literal>TYPE=<replaceable>engine_name</replaceable></literal>
+ or
+ <literal>ENGINE=<replaceable>engine_name</replaceable></literal>
+ with <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
modify the file, you can use the unmodified file to create the
tables, and then use <literal>ALTER TABLE</literal> to change
- their type. The particulars are given later in this section.
+ their storage engine. The particulars are given later in this
+ section.
</para>
<para>
@@ -1485,15 +1488,15 @@
<para>
To create a copy of the entire <literal>world</literal> database
on the SQL node, use <command>mysqldump</command> on the
- non-cluster server to export it to a file named
- <filename>world.sql</filename> in the
- <filename>/usr/local/mysql/data</filename> directory. Then
- import the file into the SQL node of the cluster like this:
+ non-cluster server to export the database to a file named
+ <filename>world.sql</filename>; for example, in the
+ <filename>/tmp</filename> directory. Then modify the table
+ definitions as just described and import the file into the SQL
+ node of the cluster like this:
</para>
<programlisting>
-shell> <userinput>cd /usr/local/mysql/data</userinput>
-shell> <userinput>mysql world < world.sql</userinput>
+shell> <userinput>mysql world < /tmp/world.sql</userinput>
</programlisting>
<para>
@@ -1504,14 +1507,13 @@
<para>
It is important to note that <literal>NDB Cluster</literal> in
MySQL ¤t-series; does not support autodiscovery of
- databases. (See
- <xref linkend="mysql-cluster-limitations"/>.) This means
- that, once the <literal>world</literal> database and its tables
- have been created on one data node, you need to issue the
- <literal>CREATE DATABASE world</literal> statement followed by
- <literal>FLUSH TABLES</literal> on each SQL node in the cluster.
- This will cause the node to recognize the database and read its
- table definitions.
+ databases. (See <xref linkend="mysql-cluster-limitations"/>.)
+ This means that, once the <literal>world</literal> database and
+ its tables have been created on one data node, you need to issue
+ the <literal>CREATE DATABASE world</literal> statement followed
+ by <literal>FLUSH TABLES</literal> on each SQL node in the
+ cluster. This will cause the node to recognize the database and
+ read its table definitions.
</para>
<para>
@@ -9127,7 +9129,7 @@
Text indexes are not supported.
</para>
</listitem>
-
+
<listitem>
<para>
A <literal>BIT</literal> column cannot be a primary key or
@@ -9153,23 +9155,24 @@
</para>
<itemizedlist>
-
+
<listitem>
<para>
<emphasis role="bold">Error Reporting</emphasis>:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
A duplicate key error returns the error message
<errortext>ERROR 23000: Can't write; duplicate key in
- table
- '<replaceable>tbl_name</replaceable>'</errortext>.
+ table
+ '<replaceable>tbl_name</replaceable>'</errortext>.
</para>
</listitem>
+
</itemizedlist>
-
</listitem>
<listitem>
@@ -10324,8 +10327,7 @@
convert existing tables using other storage engines to
<literal>NDB Cluster</literal> using <literal>ALTER
TABLE</literal>, but requires an additional workaround. See
- <xref linkend="mysql-cluster-limitations"/>, for
- details.
+ <xref linkend="mysql-cluster-limitations"/>, for details.
</para>
</listitem>
@@ -10428,8 +10430,8 @@
</para>
<para>
- See <xref linkend="mysql-cluster-limitations"/>, for
- more information about these issues.
+ See <xref linkend="mysql-cluster-limitations"/>, for more
+ information about these issues.
</para>
</listitem>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-02-18 23:31:31 UTC (rev 1388)
+++ trunk/refman-5.0/ndbcluster.xml 2006-02-18 23:32:17 UTC (rev 1389)
@@ -1351,7 +1351,7 @@
<literal>NDB Cluster</literal> storage engine. To specify
this, use the <option>ENGINE=NDB</option> or
<option>ENGINE=NDBCLUSTER</option> table option. You can add
- this open when creating the table:
+ this option when creating the table:
</para>
<programlisting>
@@ -1389,7 +1389,7 @@
output of <command>mysqldump</command>, you can open the SQL
script in a text editor and add the <literal>ENGINE</literal>
option to any table creation statements, or replace any existing
- <literal>ENGINE</literal> (or <literal>TYPE</literal>) option.
+ <literal>ENGINE</literal> (or <literal>TYPE</literal>) options.
Suppose that you have the <literal>world</literal> sample
database on another MySQL server that does not support MySQL
Cluster, and you want to export the <literal>City</literal>
@@ -1430,7 +1430,8 @@
accomplished. One of these is to modify the table definition
<emphasis>before</emphasis> importing it into the Cluster
database. Using the <literal>City</literal> table as an example,
- the definition would be modified as follows:
+ modify the <literal>ENGINE</literal> option of the definition as
+ follows:
</para>
<programlisting>
@@ -1455,12 +1456,14 @@
part of the clustered database. The easiest way to accomplish
this is to do a search-and-replace on the file that contains the
definitions and replace all instances of
- <literal>TYPE=MyISAM</literal> or
- <literal>ENGINE=MyISAM</literal> with
- <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
+ <literal>TYPE=<replaceable>engine_name</replaceable></literal>
+ or
+ <literal>ENGINE=<replaceable>engine_name</replaceable></literal>
+ with <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
modify the file, you can use the unmodified file to create the
tables, and then use <literal>ALTER TABLE</literal> to change
- their type. The particulars are given later in this section.
+ their storage engine. The particulars are given later in this
+ section.
</para>
<para>
@@ -1485,15 +1488,15 @@
<para>
To create a copy of the entire <literal>world</literal> database
on the SQL node, use <command>mysqldump</command> on the
- non-cluster server to export it to a file named
- <filename>world.sql</filename> in the
- <filename>/usr/local/mysql/data</filename> directory. Then
- import the file into the SQL node of the cluster like this:
+ non-cluster server to export the database to a file named
+ <filename>world.sql</filename>; for example, in the
+ <filename>/tmp</filename> directory. Then modify the table
+ definitions as just described and import the file into the SQL
+ node of the cluster like this:
</para>
<programlisting>
-shell> <userinput>cd /usr/local/mysql/data</userinput>
-shell> <userinput>mysql world < world.sql</userinput>
+shell> <userinput>mysql world < /tmp/world.sql</userinput>
</programlisting>
<para>
@@ -9102,7 +9105,7 @@
Text indexes are not supported.
</para>
</listitem>
-
+
<listitem>
<para>
A <literal>BIT</literal> column cannot be a primary key or
@@ -9131,23 +9134,24 @@
</para>
<itemizedlist>
-
+
<listitem>
<para>
<emphasis role="bold">Error Reporting</emphasis>:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
A duplicate key error returns the error message
<errortext>ERROR 23000: Can't write; duplicate key in
- table
- '<replaceable>tbl_name</replaceable>'</errortext>.
+ table
+ '<replaceable>tbl_name</replaceable>'</errortext>.
</para>
</listitem>
+
</itemizedlist>
-
</listitem>
<listitem>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-02-18 23:31:31 UTC (rev 1388)
+++ trunk/refman-5.1/ndbcluster.xml 2006-02-18 23:32:17 UTC (rev 1389)
@@ -1335,7 +1335,7 @@
<literal>NDB Cluster</literal> storage engine. To specify
this, use the <option>ENGINE=NDB</option> or
<option>ENGINE=NDBCLUSTER</option> table option. You can add
- this open when creating the table:
+ this option when creating the table:
</para>
<programlisting>
@@ -1373,7 +1373,7 @@
output of <command>mysqldump</command>, you can open the SQL
script in a text editor and add the <literal>ENGINE</literal>
option to any table creation statements, or replace any existing
- <literal>ENGINE</literal> (or <literal>TYPE</literal>) option.
+ <literal>ENGINE</literal> (or <literal>TYPE</literal>) options.
Suppose that you have the <literal>world</literal> sample
database on another MySQL server that does not support MySQL
Cluster, and you want to export the <literal>City</literal>
@@ -1414,7 +1414,8 @@
accomplished. One of these is to modify the table definition
<emphasis>before</emphasis> importing it into the Cluster
database. Using the <literal>City</literal> table as an example,
- the definition would be modified as follows:
+ modify the <literal>ENGINE</literal> option of the definition as
+ follows:
</para>
<programlisting>
@@ -1439,12 +1440,14 @@
part of the clustered database. The easiest way to accomplish
this is to do a search-and-replace on the file that contains the
definitions and replace all instances of
- <literal>TYPE=MyISAM</literal> or
- <literal>ENGINE=MyISAM</literal> with
- <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
+ <literal>TYPE=<replaceable>engine_name</replaceable></literal>
+ or
+ <literal>ENGINE=<replaceable>engine_name</replaceable></literal>
+ with <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
modify the file, you can use the unmodified file to create the
tables, and then use <literal>ALTER TABLE</literal> to change
- their type. The particulars are given later in this section.
+ their storage engine. The particulars are given later in this
+ section.
</para>
<para>
@@ -1469,15 +1472,15 @@
<para>
To create a copy of the entire <literal>world</literal> database
on the SQL node, use <command>mysqldump</command> on the
- non-cluster server to export it to a file named
- <filename>world.sql</filename> in the
- <filename>/usr/local/mysql/data</filename> directory. Then
- import the file into the SQL node of the cluster like this:
+ non-cluster server to export the database to a file named
+ <filename>world.sql</filename>; for example, in the
+ <filename>/tmp</filename> directory. Then modify the table
+ definitions as just described and import the file into the SQL
+ node of the cluster like this:
</para>
<programlisting>
-shell> <userinput>cd /usr/local/mysql/data</userinput>
-shell> <userinput>mysql world < world.sql</userinput>
+shell> <userinput>mysql world < /tmp/world.sql</userinput>
</programlisting>
<para>
@@ -8821,7 +8824,7 @@
</para>
<programlisting>
-ndb-connectstring=<replaceable>management-host</replaceable>[:<replaceable>port</replaceable>]
+ndb-connectstring=<replaceable>management_host</replaceable>[:<replaceable>port</replaceable>]
</programlisting>
<para>
@@ -9287,13 +9290,13 @@
</para>
<programlisting>
-ndb-connectstring=<replaceable>management-host</replaceable>[:<replaceable>port</replaceable>]
+ndb-connectstring=<replaceable>management_host</replaceable>[:<replaceable>port</replaceable>]
</programlisting>
<para>
in a <literal>[MYSQL_CLUSTER]</literal> section in the
<filename>my.cnf file</filename>, where
- <replaceable>management-host</replaceable> is the IP
+ <replaceable>management_host</replaceable> is the IP
address or hostname of the NDB management server for the
master cluster, and <replaceable>port</replaceable> is
the management server's port number. Note that the port
@@ -9327,11 +9330,11 @@
</para>
<programlisting>
-shell<replaceable>M</replaceable>> <userinput>ndb_mgm management-host:port -e "START BACKUP"</userinput>
+shell<replaceable>M</replaceable>> <userinput>ndb_mgm management_host:port -e "START BACKUP"</userinput>
</programlisting>
<para>
- where <replaceable>management-host</replaceable> and
+ where <replaceable>management_host</replaceable> and
<replaceable>port</replaceable> are the hostname and
port number of the management server. In our scenario as
outlined earliuer in this section (see
@@ -9780,8 +9783,8 @@
</para>
<programlisting>
-mysql<replaceable>S*</replaceable>> <userinput>CREATE SCHEMA <replaceable>db-name</replaceable>;</userinput>
-mysql<replaceable>S*</replaceable>> <userinput>DROP SCHEMA <replaceable>db-name</replaceable>;</userinput>
+mysql<replaceable>S*</replaceable>> <userinput>CREATE SCHEMA <replaceable>db_name</replaceable>;</userinput>
+mysql<replaceable>S*</replaceable>> <userinput>DROP SCHEMA <replaceable>db_name</replaceable>;</userinput>
</programlisting>
<para>
@@ -9809,7 +9812,7 @@
</para>
<programlisting>
-mysql<replaceable>S</replaceable>& <userinput>DROP TABLE [<replaceable>db-name</replaceable>.]<replaceable>table-name</replaceable>;</userinput>
+mysql<replaceable>S</replaceable>& <userinput>DROP TABLE [<replaceable>db_name</replaceable>.]<replaceable>table_name</replaceable>;</userinput>
</programlisting>
</listitem>
@@ -9820,7 +9823,7 @@
</para>
<programlisting>
-mysql<replaceable>S*</replaceable>> <userinput>SHOW TABLES [FROM <replaceable>db-name</replaceable>];</userinput>
+mysql<replaceable>S*</replaceable>> <userinput>SHOW TABLES [FROM <replaceable>db_name</replaceable>];</userinput>
</programlisting>
</listitem>
@@ -9848,7 +9851,7 @@
</para>
<programlisting>
-mysql<replaceable>S</replaceable>> <userinput>CREATE TABLE [<replaceable>db-name</replaceable>.]<replaceable>table-name</replaceable> (</userinput>
+mysql<replaceable>S</replaceable>> <userinput>CREATE TABLE [<replaceable>db_name</replaceable>.]<replaceable>table_name</replaceable> (</userinput>
<userinput><replaceable># column and index definitions...</replaceable></userinput>
<userinput>) ENGINE=NDB;</userinput>
</programlisting>
@@ -9861,7 +9864,7 @@
</para>
<programlisting>
-mysql<replaceable>S*</replaceable>> <userinput>SHOW TABLES [FROM <replaceable>db-name</replaceable>];</userinput>
+mysql<replaceable>S*</replaceable>> <userinput>SHOW TABLES [FROM <replaceable>db_name</replaceable>];</userinput>
</programlisting>
<para>
@@ -9900,7 +9903,7 @@
</para>
<programlisting>
-mysql<replaceable>S</replaceable>> <userinput>ALTER TABLE table-name /* <replaceable>column-definition(s)...</replaceable> */;</userinput>
+mysql<replaceable>S</replaceable>> <userinput>ALTER TABLE table_name /* <replaceable>column-definition, ...</replaceable> */;</userinput>
</programlisting>
</listitem>
@@ -10738,7 +10741,7 @@
Text indexes are not supported.
</para>
</listitem>
-
+
<listitem>
<para>
A <literal>BIT</literal> column cannot be a primary key or
@@ -10792,23 +10795,24 @@
</para>
<itemizedlist>
-
+
<listitem>
<para>
<emphasis role="bold">Error Reporting</emphasis>:
</para>
-
+
<itemizedlist>
+
<listitem>
<para>
A duplicate key error returns the error message
<errortext>ERROR 23000: Can't write; duplicate key in
- table
- '<replaceable>tbl_name</replaceable>'</errortext>.
+ table
+ '<replaceable>tbl_name</replaceable>'</errortext>.
</para>
</listitem>
+
</itemizedlist>
-
</listitem>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1389 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 19 Feb |
