Author: jstephens
Date: 2006-11-13 11:34:49 +0100 (Mon, 13 Nov 2006)
New Revision: 3923
Log:
logfile[s] -> log file[s]
datafile[s] -> data file[s]
Modified:
trunk/refman-4.1/apis.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/mysql-cluster.xml
trunk/refman-4.1/news-4.1.xml
trunk/refman-4.1/se-innodb.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.0/mysql-cluster.xml
trunk/refman-5.0/news-5.0.xml
trunk/refman-5.0/se-innodb.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/apis-c.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/mysql-cluster.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-5.1/se-falcon.xml
trunk/refman-5.1/se-innodb.xml
trunk/refman-5.1/sql-syntax.xml
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/apis.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1228 bytes
@@ -7271,7 +7271,7 @@
This function installs callbacks to be used during the
execution of <literal>LOAD DATA LOCAL INFILE</literal>
statements. It enables application programs to exert control
- over local (client-side) datafile reading. The arguments are
+ over local (client-side) data file reading. The arguments are
the connection handler, a set of pointers to callback
functions, and a pointer to a data area that the callbacks can
use to share information.
@@ -7289,7 +7289,7 @@
<para>
The initialization function. This is called once to do any
- setup necessary, open the datafile, allocate data structures,
+ setup necessary, open the data file, allocate data structures,
and so forth. The first <literal>void**</literal> argument is
a pointer to a pointer. You can set the pointer (that is,
<literal>*ptr</literal>) to a value that will be passed to
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1097 bytes
@@ -3052,7 +3052,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 2 Keyfile pointer (bytes): 2
-Max datafile length: 54657023 Max keyfile length: 33554431
+Max data file length: 54657023 Max keyfile length: 33554431
Recordlength: 834
Record format: Fixed length
@@ -3145,7 +3145,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 1
-Max datafile length: 16777215 Max keyfile length: 131071
+Max data file length: 16777215 Max keyfile length: 131071
Recordlength: 834
Record format: Compressed
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/database-administration.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 900 bytes
@@ -20335,7 +20335,7 @@
Data records: 1403698 Deleted blocks: 0
Datafile parts: 1403698 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 3
-Max datafile length: 3791650815 Max keyfile length: 4294967294
+Max data file length: 3791650815 Max keyfile length: 4294967294
Recordlength: 226
table description:
@@ -20572,7 +20572,7 @@
<listitem>
<para>
- <literal>Max datafile length</literal>
+ <literal>Max data file length</literal>
</para>
<para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/installing.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 595 bytes
@@ -4557,7 +4557,7 @@
</para>
<programlisting>
-InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
+InnoDB: The first specified data file c:\ibdata\ibdata1 did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-4.1/mysql-cluster.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/mysql-cluster.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 9, Lines Added: 13, Lines Deleted: 13; 5228 bytes
@@ -1459,18 +1459,18 @@
# Management process options:
[NDB_MGMD]
hostname=192.168.0.10 # Hostname or IP address of MGM node
-datadir=/var/lib/mysql-cluster # Directory for MGM node logfiles
+datadir=/var/lib/mysql-cluster # Directory for MGM node log files
# Options for data node "A":
[NDBD]
# (one [NDBD] section per data node)
hostname=192.168.0.30 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# Options for data node "B":
[NDBD]
hostname=192.168.0.40 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# SQL node options:
[MYSQLD]
@@ -3205,7 +3205,7 @@
<listitem>
<para>
<literal>filename</literal>: The name of the
- logfile.
+ log file.
</para>
</listitem>
@@ -3214,7 +3214,7 @@
<literal>maxsize</literal>: The maximum size (in
bytes) to which the file can grow before logging
rolls over to a new file. When this occurs, the
- old logfile is renamed by appending
+ old log file is renamed by appending
<replaceable>.N</replaceable> to the filename,
where <replaceable>N</replaceable> is the next
number not yet used with this name.
@@ -3224,7 +3224,7 @@
<listitem>
<para>
<literal>maxfiles</literal>: The maximum number of
- logfiles.
+ log files.
</para>
</listitem>
@@ -7916,16 +7916,16 @@
</para>
<para>
- Next, we need to determine the number of REDO logfiles required
+ Next, we need to determine the number of REDO log files required
— that is, fragment log files — the corresponding
parameter being <literal>NoOfFragmentLogFiles</literal>. We need
- to make sure that there are sufficient REDO logfiles for keeping
+ to make sure that there are sufficient REDO log files for keeping
records for at least 3 local checkpoints. In a production
setting, there are always uncertainties — for instance, we
cannot be sure that disks always operate at top speed or with
maximum throughput. For this reason, it is best to err on the
side of caution, so we double our requirement and calculate a
- number of fragment logfiles which should be enough to keep
+ number of fragment log files which should be enough to keep
records covering 6 local checkpoints.
</para>
@@ -8001,7 +8001,7 @@
by 1800 seconds, this yields 16524000 bytes required for REDO
logging, or approximately 15.75 MB. The unit used for
<literal>NoOfFragmentLogFiles</literal> represents a set of 4
- 16-MB logfiles — that is, 64 MB. Thus, the minimum value
+ 16-MB log files — that is, 64 MB. Thus, the minimum value
(3) for this parameter is sufficient for the scenario envisioned
in this example, since 3 times 64 = 192 MB, or about 12 times
what is required; the default value of 8 (or 512 MB) is more
@@ -9448,7 +9448,7 @@
node restart or system restart repeatedly fails. In
this case, be aware that this node can no longer be
used to restore data due to the destruction of the
- datafiles.
+ data files.
</para>
</listitem>
@@ -13506,7 +13506,7 @@
<para>
<emphasis role="bold">Description</emphasis>: Creates an archive
- from data node and management node logfiles that can be used to
+ from data node and management node log files that can be used to
help diagnose bugs or other problems with a cluster.
<emphasis>It is highly recommended that you make use of this
utility when filing reports of bugs in MySQL Cluster</emphasis>.
@@ -13525,7 +13525,7 @@
requires the path to the management host configuration file
(<filename>config.ini</filename>). Optionally, you can supply
the name of a user that is able to access the cluster's data
- nodes via SSH, in order to copy the data node logfiles.
+ nodes via SSH, in order to copy the data node log files.
ndb_error_reporter then includes all of these files in archive
that is created in the same directory in which it is run. The
archive is named
Modified: trunk/refman-4.1/news-4.1.xml
===================================================================
--- trunk/refman-4.1/news-4.1.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/news-4.1.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1516 bytes
@@ -2903,7 +2903,7 @@
<literal>NDB Cluster</literal>: More descriptive warnings are
now issued when inappropriate logging parameters are set in
<filename>config.ini</filename>. (Formerly, the warning issued
- was simply <errortext>Could not add logfile
+ was simply <errortext>Could not add log file
destination</errortext> .) (Bug #11331)
</para>
</listitem>
@@ -12230,7 +12230,7 @@
<para>
Fixed a bug in <literal>CHECK TABLE</literal> that sometimes
resulted in a spurious error <literal>Found key at page ...
- that points to record outside datafile</literal> for a table
+ that points to record outside data file</literal> for a table
with a <literal>FULLTEXT</literal> index. (Bug #2190)
</para>
</listitem>
@@ -12282,7 +12282,7 @@
Fixed a bug in <command>myisamchk</command> and <literal>CHECK
TABLE</literal> that sometimes resulted in a spurious error
<literal>Found key at page ... that points to record outside
- datafile</literal> for a table with a
+ data file</literal> for a table with a
<literal>FULLTEXT</literal> index. (Bug #1977)
</para>
</listitem>
Modified: trunk/refman-4.1/se-innodb.xml
===================================================================
--- trunk/refman-4.1/se-innodb.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/se-innodb.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 859 bytes
@@ -1749,12 +1749,12 @@
</para>
<programlisting>
-InnoDB: The first specified datafile /home/heikki/data/ibdata1
+InnoDB: The first specified data file /home/heikki/data/ibdata1
did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file /home/heikki/data/ibdata1 size to 134217728
InnoDB: Database physically writes the file full: wait...
-InnoDB: datafile /home/heikki/data/ibdata2 did not exist:
+InnoDB: data file /home/heikki/data/ibdata2 did not exist:
new to be created
InnoDB: Setting file /home/heikki/data/ibdata2 size to 262144000
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-4.1/sql-syntax.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 794 bytes
@@ -19507,7 +19507,7 @@
@node SHOW NEW MASTER, PURGE MASTER LOGS, SHOW BINLOG EVENTS,
Replication SQL @subsubsection @code{SHOW NEW MASTER FOR
SLAVE} @code{SHOW NEW MASTER FOR SLAVE WITH
- MASTER_LOG_FILE='@var{logfile}' AND MASTER_LOG_POS=@var{pos}
+ MASTER_LOG_FILE='@var{log file}' AND MASTER_LOG_POS=@var{pos}
AND MASTER_LOG_SEQ=@var{log_seq} AND
MASTER_SERVER_ID=@var{server_id}} This statement is used when
a slave of a possibly dead/unavailable master needs to be
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/apis.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1228 bytes
@@ -6870,7 +6870,7 @@
This function installs callbacks to be used during the
execution of <literal>LOAD DATA LOCAL INFILE</literal>
statements. It enables application programs to exert control
- over local (client-side) datafile reading. The arguments are
+ over local (client-side) data file reading. The arguments are
the connection handler, a set of pointers to callback
functions, and a pointer to a data area that the callbacks can
use to share information.
@@ -6888,7 +6888,7 @@
<para>
The initialization function. This is called once to do any
- setup necessary, open the datafile, allocate data structures,
+ setup necessary, open the data file, allocate data structures,
and so forth. The first <literal>void**</literal> argument is
a pointer to a pointer. You can set the pointer (that is,
<literal>*ptr</literal>) to a value that will be passed to
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1097 bytes
@@ -2911,7 +2911,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 2 Keyfile pointer (bytes): 2
-Max datafile length: 54657023 Max keyfile length: 33554431
+Max data file length: 54657023 Max keyfile length: 33554431
Recordlength: 834
Record format: Fixed length
@@ -3004,7 +3004,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 1
-Max datafile length: 16777215 Max keyfile length: 131071
+Max data file length: 16777215 Max keyfile length: 131071
Recordlength: 834
Record format: Compressed
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/database-administration.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 900 bytes
@@ -23842,7 +23842,7 @@
Data records: 1403698 Deleted blocks: 0
Datafile parts: 1403698 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 3
-Max datafile length: 3791650815 Max keyfile length: 4294967294
+Max data file length: 3791650815 Max keyfile length: 4294967294
Recordlength: 226
table description:
@@ -24074,7 +24074,7 @@
<listitem>
<para>
- <literal>Max datafile length</literal>
+ <literal>Max data file length</literal>
</para>
<para>
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/installing-cs.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 604 bytes
@@ -3692,7 +3692,7 @@
</para>
<programlisting>
-InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
+InnoDB: The first specified data file c:\ibdata\ibdata1 did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/mysql-cluster.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 9, Lines Added: 13, Lines Deleted: 13; 5228 bytes
@@ -1453,18 +1453,18 @@
# Management process options:
[NDB_MGMD]
hostname=192.168.0.10 # Hostname or IP address of MGM node
-datadir=/var/lib/mysql-cluster # Directory for MGM node logfiles
+datadir=/var/lib/mysql-cluster # Directory for MGM node log files
# Options for data node "A":
[NDBD]
# (one [NDBD] section per data node)
hostname=192.168.0.30 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# Options for data node "B":
[NDBD]
hostname=192.168.0.40 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# SQL node options:
[MYSQLD]
@@ -3183,7 +3183,7 @@
<listitem>
<para>
<literal>filename</literal>: The name of the
- logfile.
+ log file.
</para>
</listitem>
@@ -3192,7 +3192,7 @@
<literal>maxsize</literal>: The maximum size (in
bytes) to which the file can grow before logging
rolls over to a new file. When this occurs, the
- old logfile is renamed by appending
+ old log file is renamed by appending
<replaceable>.N</replaceable> to the filename,
where <replaceable>N</replaceable> is the next
number not yet used with this name.
@@ -3202,7 +3202,7 @@
<listitem>
<para>
<literal>maxfiles</literal>: The maximum number of
- logfiles.
+ log files.
</para>
</listitem>
@@ -7897,16 +7897,16 @@
</para>
<para>
- Next, we need to determine the number of REDO logfiles required
+ Next, we need to determine the number of REDO log files required
— that is, fragment log files — the corresponding
parameter being <literal>NoOfFragmentLogFiles</literal>. We need
- to make sure that there are sufficient REDO logfiles for keeping
+ to make sure that there are sufficient REDO log files for keeping
records for at least 3 local checkpoints. In a production
setting, there are always uncertainties — for instance, we
cannot be sure that disks always operate at top speed or with
maximum throughput. For this reason, it is best to err on the
side of caution, so we double our requirement and calculate a
- number of fragment logfiles which should be enough to keep
+ number of fragment log files which should be enough to keep
records covering 6 local checkpoints.
</para>
@@ -7982,7 +7982,7 @@
by 1800 seconds, this yields 16524000 bytes required for REDO
logging, or approximately 15.75 MB. The unit used for
<literal>NoOfFragmentLogFiles</literal> represents a set of 4
- 16-MB logfiles — that is, 64 MB. Thus, the minimum value
+ 16-MB log files — that is, 64 MB. Thus, the minimum value
(3) for this parameter is sufficient for the scenario envisioned
in this example, since 3 times 64 = 192 MB, or about 12 times
what is required; the default value of 8 (or 512 MB) is more
@@ -9416,7 +9416,7 @@
node restart or system restart repeatedly fails. In
this case, be aware that this node can no longer be
used to restore data due to the destruction of the
- datafiles.
+ data files.
</para>
</listitem>
@@ -13566,7 +13566,7 @@
<para>
<emphasis role="bold">Description</emphasis>: Creates an archive
- from data node and management node logfiles that can be used to
+ from data node and management node log files that can be used to
help diagnose bugs or other problems with a cluster.
<emphasis>It is highly recommended that you make use of this
utility when filing reports of bugs in MySQL Cluster</emphasis>.
@@ -13585,7 +13585,7 @@
requires the path to the management host configuration file
(<filename>config.ini</filename>). Optionally, you can supply
the name of a user that is able to access the cluster's data
- nodes via SSH, in order to copy the data node logfiles.
+ nodes via SSH, in order to copy the data node log files.
ndb_error_reporter then includes all of these files in archive
that is created in the same directory in which it is run. The
archive is named
Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/news-5.0.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 670 bytes
@@ -6277,7 +6277,7 @@
<literal>NDB Cluster</literal>: More descriptive warnings are
now issued when inappropriate logging parameters are set in
<filename>config.ini</filename>. (Formerly, the warning issued
- was simply <errortext>Could not add logfile
+ was simply <errortext>Could not add log file
destination</errortext>.) (Bug #11331)
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb.xml
===================================================================
--- trunk/refman-5.0/se-innodb.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/se-innodb.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 859 bytes
@@ -1812,12 +1812,12 @@
</para>
<programlisting>
-InnoDB: The first specified datafile /home/heikki/data/ibdata1
+InnoDB: The first specified data file /home/heikki/data/ibdata1
did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file /home/heikki/data/ibdata1 size to 134217728
InnoDB: Database physically writes the file full: wait...
-InnoDB: datafile /home/heikki/data/ibdata2 did not exist:
+InnoDB: data file /home/heikki/data/ibdata2 did not exist:
new to be created
InnoDB: Setting file /home/heikki/data/ibdata2 size to 262144000
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.0/sql-syntax.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 794 bytes
@@ -21744,7 +21744,7 @@
@node SHOW NEW MASTER, PURGE MASTER LOGS, SHOW BINLOG EVENTS,
Replication SQL @subsubsection @code{SHOW NEW MASTER FOR
SLAVE} @code{SHOW NEW MASTER FOR SLAVE WITH
- MASTER_LOG_FILE='@var{logfile}' AND MASTER_LOG_POS=@var{pos}
+ MASTER_LOG_FILE='@var{log file}' AND MASTER_LOG_POS=@var{pos}
AND MASTER_LOG_SEQ=@var{log_seq} AND
MASTER_SERVER_ID=@var{server_id}} This statement is used when
a slave of a possibly dead/unavailable master needs to be
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/apis-c.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1220 bytes
@@ -6667,7 +6667,7 @@
This function installs callbacks to be used during the execution
of <literal>LOAD DATA LOCAL INFILE</literal> statements. It
enables application programs to exert control over local
- (client-side) datafile reading. The arguments are the connection
+ (client-side) data file reading. The arguments are the connection
handler, a set of pointers to callback functions, and a pointer
to a data area that the callbacks can use to share information.
</para>
@@ -6684,7 +6684,7 @@
<para>
The initialization function. This is called once to do any setup
- necessary, open the datafile, allocate data structures, and so
+ necessary, open the data file, allocate data structures, and so
forth. The first <literal>void**</literal> argument is a pointer
to a pointer. You can set the pointer (that is,
<literal>*ptr</literal>) to a value that will be passed to each
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1097 bytes
@@ -2896,7 +2896,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 2 Keyfile pointer (bytes): 2
-Max datafile length: 54657023 Max keyfile length: 33554431
+Max data file length: 54657023 Max keyfile length: 33554431
Recordlength: 834
Record format: Fixed length
@@ -2989,7 +2989,7 @@
Data records: 1192 Deleted blocks: 0
Datafile parts: 1192 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 1
-Max datafile length: 16777215 Max keyfile length: 131071
+Max data file length: 16777215 Max keyfile length: 131071
Recordlength: 834
Record format: Compressed
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/database-administration.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 900 bytes
@@ -24340,7 +24340,7 @@
Data records: 1403698 Deleted blocks: 0
Datafile parts: 1403698 Deleted data: 0
Datafile pointer (bytes): 3 Keyfile pointer (bytes): 3
-Max datafile length: 3791650815 Max keyfile length: 4294967294
+Max data file length: 3791650815 Max keyfile length: 4294967294
Recordlength: 226
table description:
@@ -24573,7 +24573,7 @@
<listitem>
<para>
- <literal>Max datafile length</literal>
+ <literal>Max data file length</literal>
</para>
<para>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/information-schema.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 4, Lines Added: 9, Lines Deleted: 9; 2595 bytes
@@ -4645,9 +4645,9 @@
<listitem>
<para>
<literal>FILE_NAME</literal> is the name of an
- <literal>UNDO</literal> logfile created by <literal>CREATE
+ <literal>UNDO</literal> log file created by <literal>CREATE
LOGFILE GROUP</literal> or <literal>ALTER LOGFILE
- GROUP</literal>, or of a datafile created by <literal>CREATE
+ GROUP</literal>, or of a data file created by <literal>CREATE
TABLESPACE</literal> or <literal>ALTER TABLESPACE</literal>.
</para>
</listitem>
@@ -4684,23 +4684,23 @@
<listitem>
<para>
The <literal>LOGFILE_GROUP_NAME</literal> column gives the
- name of the logfile group to which the logfile or datafile
+ name of the log file group to which the log file or data file
belongs.
</para>
</listitem>
<listitem>
<para>
- For an <literal>UNDO</literal> logfile, the
+ For an <literal>UNDO</literal> log file, the
<literal>LOGFILE_GROUP_NUMBER</literal> contains the
- auto-generated ID number of the logfile group to which the
- logfile belongs.
+ auto-generated ID number of the log file group to which the
+ log file belongs.
</para>
</listitem>
<listitem>
<para>
- For a MySQL Cluster Disk Data logfile or datafile, the value
+ For a MySQL Cluster Disk Data log file or data file, the value
of the <literal>ENGINE</literal> column is always
<literal>NDB</literal> or <literal>NDBCLUSTER</literal>.
</para>
@@ -4708,7 +4708,7 @@
<listitem>
<para>
- For a MySQL Cluster Disk Data logfile or datafile, the value
+ For a MySQL Cluster Disk Data log file or data file, the value
of the <literal>FULLTEXT_KEYS</literal> column is always
empty.
</para>
@@ -4770,7 +4770,7 @@
<para>
It is also important to remember that once an extent is used,
- it cannot be freed again without dropping the datafile of
+ it cannot be freed again without dropping the data file of
which it is a part. This means that deletes from a Disk Data
table do <emphasis>not</emphasis> release disk space.
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/installing.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 595 bytes
@@ -4455,7 +4455,7 @@
</para>
<programlisting>
-InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
+InnoDB: The first specified data file c:\ibdata\ibdata1 did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/mysql-cluster.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 25, Lines Added: 48, Lines Deleted: 48; 14735 bytes
@@ -1451,18 +1451,18 @@
# Management process options:
[NDB_MGMD]
hostname=192.168.0.10 # Hostname or IP address of MGM node
-datadir=/var/lib/mysql-cluster # Directory for MGM node logfiles
+datadir=/var/lib/mysql-cluster # Directory for MGM node log files
# Options for data node "A":
[NDBD]
# (one [NDBD] section per data node)
hostname=192.168.0.30 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# Options for data node "B":
[NDBD]
hostname=192.168.0.40 # Hostname or IP address
-datadir=/usr/local/mysql/data # Directory for this data node's datafiles
+datadir=/usr/local/mysql/data # Directory for this data node's data files
# SQL node options:
[MYSQLD]
@@ -1576,7 +1576,7 @@
An exception to this is that <option>--initial</option> does
not delete Disk Data files. If you do need to perform an
initial restart of the cluster, you must delete any existing
- Disk Data logfiles and datafiles manually.
+ Disk Data log files and data files manually.
</para>
</listitem>
@@ -3180,7 +3180,7 @@
<listitem>
<para>
<literal>filename</literal>: The name of the
- logfile.
+ log file.
</para>
</listitem>
@@ -3189,7 +3189,7 @@
<literal>maxsize</literal>: The maximum size (in
bytes) to which the file can grow before logging
rolls over to a new file. When this occurs, the
- old logfile is renamed by appending
+ old log file is renamed by appending
<replaceable>.N</replaceable> to the filename,
where <replaceable>N</replaceable> is the next
number not yet used with this name.
@@ -3199,7 +3199,7 @@
<listitem>
<para>
<literal>maxfiles</literal>: The maximum number of
- logfiles.
+ log files.
</para>
</listitem>
@@ -7927,16 +7927,16 @@
</para>
<para>
- Next, we need to determine the number of REDO logfiles required
+ Next, we need to determine the number of REDO log files required
— that is, fragment log files — the corresponding
parameter being <literal>NoOfFragmentLogFiles</literal>. We need
- to make sure that there are sufficient REDO logfiles for keeping
+ to make sure that there are sufficient REDO log files for keeping
records for at least 3 local checkpoints. In a production
setting, there are always uncertainties — for instance, we
cannot be sure that disks always operate at top speed or with
maximum throughput. For this reason, it is best to err on the
side of caution, so we double our requirement and calculate a
- number of fragment logfiles which should be enough to keep
+ number of fragment log files which should be enough to keep
records covering 6 local checkpoints.
</para>
@@ -8012,7 +8012,7 @@
by 1800 seconds, this yields 16524000 bytes required for REDO
logging, or approximately 15.75 MB. The unit used for
<literal>NoOfFragmentLogFiles</literal> represents a set of 4
- 16-MB logfiles — that is, 64 MB. Thus, the minimum value
+ 16-MB log files — that is, 64 MB. Thus, the minimum value
(3) for this parameter is sufficient for the scenario envisioned
in this example, since 3 times 64 = 192 MB, or about 12 times
what is required; the default value of 8 (or 512 MB) is more
@@ -9446,7 +9446,7 @@
node restart or system restart repeatedly fails. In
this case, be aware that this node can no longer be
used to restore data due to the destruction of the
- datafiles.
+ data files.
</para>
</listitem>
@@ -12444,7 +12444,7 @@
<row>
<entry><option>--no-restore-disk-objects</option></entry>
<entry><option>-d</option></entry>
- <entry>Do not restore Disk Data objects such as tablespaces and logfile groups</entry>
+ <entry>Do not restore Disk Data objects such as tablespaces and log file groups</entry>
<entry><literal>FALSE</literal> (in other words, restore Disk Data objects
unless this option is used)</entry>
</row>
@@ -13644,7 +13644,7 @@
<para>
<emphasis role="bold">Description</emphasis>: Creates an archive
- from data node and management node logfiles that can be used to
+ from data node and management node log files that can be used to
help diagnose bugs or other problems with a cluster.
<emphasis>It is highly recommended that you make use of this
utility when filing reports of bugs in MySQL Cluster</emphasis>.
@@ -13663,7 +13663,7 @@
requires the path to the management host configuration file
(<filename>config.ini</filename>). Optionally, you can supply
the name of a user that is able to access the cluster's data
- nodes via SSH, in order to copy the data node logfiles.
+ nodes via SSH, in order to copy the data node log files.
ndb_error_reporter then includes all of these files in archive
that is created in the same directory in which it is run. The
archive is named
@@ -16159,7 +16159,7 @@
Using <literal>@latest</literal> as the epoch value obtained
in the previous step, you can obtain the correct starting
position <literal>@pos</literal> in the correct binary
- logfile <literal>@file</literal> from the master's
+ log file <literal>@file</literal> from the master's
<literal>cluster.binlog_index</literal> table using the
query shown here:
</para>
@@ -16660,9 +16660,9 @@
<listitem>
<para>
- Create a <firstterm>logfile group</firstterm>, and assign one
- or more <literal>UNDO</literal> logfiles to it (an
- <literal>UNDO</literal> logfile is also referred as an
+ Create a <firstterm>log file group</firstterm>, and assign one
+ or more <literal>UNDO</literal> log files to it (an
+ <literal>UNDO</literal> log file is also referred as an
<literal>UNDOFILE</literal>).
</para>
</listitem>
@@ -16670,7 +16670,7 @@
<listitem>
<para>
Create a <firstterm>tablespace</firstterm>, and assign the
- logfile group to it, as well as one or more datafiles.
+ log file group to it, as well as one or more data files.
</para>
</listitem>
@@ -16693,22 +16693,22 @@
<listitem>
<indexterm>
<primary>MySQL Cluster Disk Data</primary>
- <secondary>creating logfile groups</secondary>
+ <secondary>creating log file groups</secondary>
</indexterm>
<para>
- We create a logfile group named <literal>lg_1</literal> using
- <literal>CREATE LOGFILE GROUP</literal>. This logfile group is
- to be made up of two <literal>UNDO</literal> logfiles, which
+ We create a log file group named <literal>lg_1</literal> using
+ <literal>CREATE LOGFILE GROUP</literal>. This log file group is
+ to be made up of two <literal>UNDO</literal> log files, which
we name <filename>undo_1.dat</filename> and
<filename>undo_2.dat</filename>, whose initial sizes are 16 MB
- and 12 MB, respectively. (You must specify a logfile's initial
- size when adding it to a logfile group.) Optionally, you can
- also specify a size for the logfile group's
+ and 12 MB, respectively. (You must specify a log file's initial
+ size when adding it to a log file group.) Optionally, you can
+ also specify a size for the log file group's
<literal>UNDO</literal> buffer, or allow it to assume the
default value of 8 MB. In this example, we set the UNDO
- buffer's size at 2 MB. A logfile group must be created with an
- <literal>UNDO</literal> logfile; so we add
+ buffer's size at 2 MB. A log file group must be created with an
+ <literal>UNDO</literal> log file; so we add
<filename>undo_1.dat</filename> to <literal>lg_1</literal> in
this <literal>CREATE LOGFILE GROUP</literal> statement:
</para>
@@ -16722,7 +16722,7 @@
</programlisting>
<para>
- To add <filename>undo_2.dat</filename> to the logfile group,
+ To add <filename>undo_2.dat</filename> to the log file group,
use the following <literal>ALTER LOGFILE GROUP</literal>
statement:
</para>
@@ -16759,7 +16759,7 @@
<para>
<emphasis role="bold">Important</emphasis>: In MySQL 5.1.8
- and later, there can exist only one logfile group at any
+ and later, there can exist only one log file group at any
given time.
</para>
</listitem>
@@ -16767,7 +16767,7 @@
<listitem>
<para>
When you add an <literal>UNDO</literal> log file to a
- logfile group using <literal>ADD UNDOFILE
+ log file group using <literal>ADD UNDOFILE
'<replaceable>filename</replaceable>'</literal>, a file
with the the name <replaceable>filename</replaceable> is
created in the
@@ -16809,28 +16809,28 @@
Now we can create a tablespace. A tablespace contains files to
be used by MySQL Cluster Disk Data tables for storing their
data. A tablespace is also associated with a particular
- logfile group. When creating a new tablespace, you must
- specify the logfile group which it is to use for
+ log file group. When creating a new tablespace, you must
+ specify the log file group which it is to use for
<literal>UNDO</literal> logging; you must also specify a
- datafile. You can add more datafiles to the tablespace after
+ data file. You can add more data files to the tablespace after
it the tablespace is created; it is also possible to drop
- datafiles from a tablespace (an example of dropping datafiles
+ data files from a tablespace (an example of dropping data files
is provided later in this section).
</para>
<para>
Assume that we wish to create a tablespace named
<literal>ts_1</literal> which uses <literal>lg_1</literal> as
- its logfile group. This tablespace is to contain two datafiles
+ its log file group. This tablespace is to contain two data files
named <filename>data_1.dat</filename> and
<filename>data_2.dat</filename>, whose initial sizes are 32 MB
and 48 MB, respectively. We can do this using two SQL
statements: <literal>CREATE TABLESPACE</literal>, to create
- <literal>ts_1</literal> with the datafile
+ <literal>ts_1</literal> with the data file
<filename>data_1.dat</filename>, and to associate
- <literal>ts_1</literal> with logfile group
+ <literal>ts_1</literal> with log file group
<literal>lg_1</literal>; and <literal>ALTER
- TABLESPACE</literal>, to add the second datafile. We show
+ TABLESPACE</literal>, to add the second data file. We show
these statements here:
</para>
@@ -16856,7 +16856,7 @@
<listitem>
<para>
As is the case with the filenames used here for
- <literal>UNDO</literal> logfiles, there is no special
+ <literal>UNDO</literal> log files, there is no special
significance for the <filename>.dat</filename> file
extension; it is used merely for easy recognition.
</para>
@@ -16962,7 +16962,7 @@
</orderedlist>
<para>
- A logfile group, a tablespace, and any Disk Data tables using
+ A log file group, a tablespace, and any Disk Data tables using
these must be created in a particular order. The same is true for
dropping any of these objects:
</para>
@@ -16976,7 +16976,7 @@
<listitem>
<para>
- A logfile group cannot be dropped, so long as any tablespaces
+ A log file group cannot be dropped, so long as any tablespaces
are using it.
</para>
</listitem>
@@ -16984,13 +16984,13 @@
<listitem>
<para>
A tablespace cannot be dropped, so long as it contains any
- datafiles.
+ data files.
</para>
</listitem>
<listitem>
<para>
- You cannot drop any datafiles from a tablespace, so long as
+ You cannot drop any data files from a tablespace, so long as
there remain any tables which are using the tablespace.
</para>
</listitem>
@@ -17035,7 +17035,7 @@
</para>
<para>
- You can obtain information about <literal>UNDO</literal> logfiles
+ You can obtain information about <literal>UNDO</literal> log files
and data files used by Disk Data tables by querying the
<literal>FILES</literal> table in the
<literal>INFORMATION_SCHEMA</literal> database. For more
@@ -17082,8 +17082,8 @@
<para>
This determines the amount of memory that is used for log
buffers, disk operations (such as page requests and wait
- queues), and metadata for tablespaces, logfile groups,
- <literal>UNDO</literal> files, and datafiles. It can be set in
+ queues), and metadata for tablespaces, log file groups,
+ <literal>UNDO</literal> files, and data files. It can be set in
the <literal>[NDBD]</literal> or <literal>[NDBD
DEFAULT]</literal> section of the
<filename>config.ini</filename> configuration file, and is
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/news-5.1.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 8, Lines Added: 9, Lines Deleted: 9; 3483 bytes
@@ -2662,7 +2662,7 @@
<para>
<literal>NDB Cluster</literal> (Disk Data):
<command>mysqldump</command> did not back up tablespace or
- logfile group information for Disk Data tables correctly.
+ log file group information for Disk Data tables correctly.
(Specifically, <literal>UNDO_BUFFER_SIZE</literal> and
<literal>INITIAL_SIZE</literal> values were misreported.)
Trying to restore from such a backup would produce error 1296
@@ -2677,7 +2677,7 @@
<literal>INFORMATION_SCHEMA.FILES</literal> table showed
incorrect values in the <literal>EXTENT_SIZE</literal>,
<literal>FREE_EXTENTS</literal>, and
- <literal>TOTAL_EXTENTS</literal> columns for UNDO logfiles.
+ <literal>TOTAL_EXTENTS</literal> columns for UNDO log files.
(Bug #20073)
</para>
</listitem>
@@ -4537,7 +4537,7 @@
<para>
<literal>NDB Cluster</literal> (Disk Data): Trying to create a
Disk Data table using a nonexistent tablespace or trying to
- drop a nonexistent datafile from a tablespace produced an
+ drop a nonexistent data file from a tablespace produced an
uninformative error message. (Bug #21751)
</para>
</listitem>
@@ -4545,7 +4545,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal> (Disk Data): Errors could occur
- when dropping a datafile during a node local checkpoint. (Bug
+ when dropping a data file during a node local checkpoint. (Bug
#21710)
</para>
</listitem>
@@ -4553,7 +4553,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal> (Disk Data): Creating a
- tablespace and logfile group, then attempting to restart the
+ tablespace and log file group, then attempting to restart the
cluster without using the <option>--initial</option> option
and without having created any Disk Data tables could cause a
forced shutdown of the cluster and raise a configuration
@@ -4761,7 +4761,7 @@
<listitem>
<para>
- <literal>NDB Cluster</literal> (Disk Data): A datafile created
+ <literal>NDB Cluster</literal> (Disk Data): A data file created
on one tablespace could be dropped using <literal>ALTER
TABLESPACE ... DROP DATAFILE</literal> on a different
tablespace. (Bug #20053)
@@ -7254,8 +7254,8 @@
<listitem>
<para>
<literal>NDB Cluster</literal> (Disk Data): Concurrent table
- schema operations and operations on logfiles groups,
- tablespaces, datafiles, or undofiles could lead to Cluster
+ schema operations and operations on log files groups,
+ tablespaces, data files, or undofiles could lead to Cluster
node failures. (Bug #18575)
</para>
</listitem>
@@ -8259,7 +8259,7 @@
<listitem>
<para>
<literal>NDB Cluster</literal> (Disk Data): You can now have
- only one logfile group at any one time. See
+ only one log file group at any one time. See
<xref
linkend="create-logfile-group"/>. (Bug
#16386)
Modified: trunk/refman-5.1/se-falcon.xml
===================================================================
--- trunk/refman-5.1/se-falcon.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/se-falcon.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 2036 bytes
@@ -245,7 +245,7 @@
<para>
<literal>log_file_memory_use</literal> (Log file memory use)
configures the amount of memory allocated to providing
- access to the physical logfile stored on disk. Currently the
+ access to the physical log file stored on disk. Currently the
log file memory is fixed at 8MB.
</para>
</listitem>-->
@@ -350,7 +350,7 @@
<para>
Two further files contain the on-disk copy of the Falcon serial
log. These are also created within the realm of the corresponding
- database. So with the above example datafile
+ database. So with the above example data file
<filename>test.fts</filename> the log files will be named
<filename>test.fl1</filename> and <filename>test.fl2</filename>.
</para>
@@ -432,7 +432,7 @@
<listitem>
<para>
- <emphasis role="bold">User datafile</emphasis> — stores
+ <emphasis role="bold">User data file</emphasis> — stores
the Falcon data.
</para>
</listitem>
@@ -480,7 +480,7 @@
<section id="se-falcon-principles-tablespace">
- <title>Falcon datafile and data structures</title>
+ <title>Falcon data file and data structures</title>
<para>
A single Falcon database file stores all record data, indexes,
@@ -505,7 +505,7 @@
<para>
All transactions on the database are logged and stored within a
- separate log file. The logfile is automatically flushed and the
+ separate log file. The log file is automatically flushed and the
changes written to disk when there is a
<literal>COMMIT</literal> command, when auto-commit is enabled,
or automatically every 30 seconds when transactions are not
Modified: trunk/refman-5.1/se-innodb.xml
===================================================================
--- trunk/refman-5.1/se-innodb.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/se-innodb.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 859 bytes
@@ -1787,12 +1787,12 @@
</para>
<programlisting>
-InnoDB: The first specified datafile /home/heikki/data/ibdata1
+InnoDB: The first specified data file /home/heikki/data/ibdata1
did not exist:
InnoDB: a new database to be created!
InnoDB: Setting file /home/heikki/data/ibdata1 size to 134217728
InnoDB: Database physically writes the file full: wait...
-InnoDB: datafile /home/heikki/data/ibdata2 did not exist:
+InnoDB: data file /home/heikki/data/ibdata2 did not exist:
new to be created
InnoDB: Setting file /home/heikki/data/ibdata2 size to 262144000
InnoDB: Database physically writes the file full: wait...
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-11-13 05:38:11 UTC (rev 3922)
+++ trunk/refman-5.1/sql-syntax.xml 2006-11-13 10:34:49 UTC (rev 3923)
Changed blocks: 18, Lines Added: 37, Lines Deleted: 37; 10730 bytes
@@ -1309,7 +1309,7 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file</replaceable>' to an existing logfile group
+ '<replaceable>file</replaceable>' to an existing log file group
<replaceable>logfile_group</replaceable>. An <literal>ALTER
LOGFILE GROUP</literal> statement has one and only one
<literal>ADD UNDOFILE</literal> clause. No <literal>DROP
@@ -1328,7 +1328,7 @@
<para>
The <literal>ENGINE</literal> parameter (required) determines
- the storage engine which is used by this logfile group, with
+ the storage engine which is used by this log file group, with
<replaceable>engine</replaceable> being the name of the storage
engine. In MySQL 5.1, the only accepted values for
<replaceable>engine</replaceable> are <literal>NDB</literal> and
@@ -1336,7 +1336,7 @@
</para>
<para>
- Here is an example, which assumes that the logfile group
+ Here is an example, which assumes that the log file group
<literal>lg_3</literal> has already been created using
<literal>CREATE LOGFILE GROUP</literal> (see
<xref linkend="create-logfile-group"/>):
@@ -1352,7 +1352,7 @@
<para>
When <literal>ALTER LOGFILE GROUP</literal> is used with
<literal>ENGINE = NDB</literal>, an <literal>UNDO</literal>
- logfile is created on each Cluster data node. You can verify
+ log file is created on each Cluster data node. You can verify
that the <literal>UNDO</literal> files were created and obtain
information about them by querying the
<literal>INFORMATION_SCHEMA.FILES</literal> table. For example:
@@ -1406,8 +1406,8 @@
</programlisting>
<para>
- This statement can be used either to add a new datafile, or to
- drop a datafile from a tablespace.
+ This statement can be used either to add a new data file, or to
+ drop a data file from a tablespace.
</para>
<para>
@@ -1422,15 +1422,15 @@
</para>
<para>
- Once a datafile has been created, its size cannot be changed;
- however, you can add more datafiles to the tablespace using
+ Once a data file has been created, its size cannot be changed;
+ however, you can add more data files to the tablespace using
additional <literal>ALTER TABLESPACE ... ADD DATAFILE</literal>
statements.
</para>
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
- TABLESPACE</literal> drops a datafile
+ TABLESPACE</literal> drops a data file
'<replaceable>file</replaceable>' from the tablespace. This file
must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
@@ -1448,11 +1448,11 @@
<para>
When <literal>ALTER TABLESPACE ... ADD DATAFILE</literal> is
- used with <literal>ENGINE = NDB</literal>, a datafile is created
- on each Cluster data node. You can verify that the datafiles
+ used with <literal>ENGINE = NDB</literal>, a data file is created
+ on each Cluster data node. You can verify that the data files
were created and obtain information about them by querying the
<literal>INFORMATION_SCHEMA.FILES</literal> table. For example,
- the following query shows all datafiles belonging to the
+ the following query shows all data files belonging to the
tablespace named <literal>newts</literal>:
</para>
@@ -3932,7 +3932,7 @@
</programlisting>
<para>
- This statement creates a new logfile group named
+ This statement creates a new log file group named
<replaceable>logfile_group</replaceable> having a single
<literal>UNDO</literal> file named
'<replaceable>undo_file</replaceable>'. A <literal>CREATE
@@ -3941,7 +3941,7 @@
</para>
<para>
- Beginning with MySQL 5.1.8, you can have only one logfile group
+ Beginning with MySQL 5.1.8, you can have only one log file group
per Cluster at any given time. (See Bug #16386)
</para>
@@ -3949,7 +3949,7 @@
The <literal>INITIAL_SIZE</literal> parameter sets the
<literal>UNDO</literal> file's initial size. The optional
<literal>UNDO_BUFFFER_SIZE</literal> parameter sets the size
- used by the <literal>UNDO</literal> buffer for the logfile
+ used by the <literal>UNDO</literal> buffer for the log file
group; The default value for <literal>UNDO_BUFFER_SIZE</literal>
is <literal>8M</literal> (eight megabytes); this value cannot
exceeed the amount of system memory avilable. Both
@@ -3964,7 +3964,7 @@
<para>
The <literal>ENGINE</literal> parameter determines the storage
- engine to be used by this logfile group, with
+ engine to be used by this log file group, with
<replaceable>engine</replaceable> being the name of the storage
engine. In MySQL 5.1. <replaceable>engine</replaceable> must be
one of the values <literal>NDB</literal> or
@@ -3972,8 +3972,8 @@
</para>
<para>
- When used with <literal>ENGINE = NDB</literal>, a logfile group
- and associated <literal>UNDO</literal> logfile are created on
+ When used with <literal>ENGINE = NDB</literal>, a log file group
+ and associated <literal>UNDO</literal> log file are created on
each Cluster data node. You can verify that the
<literal>UNDO</literal> files were created and obtain
information about them by querying the
@@ -4026,21 +4026,21 @@
<para>
This statement is used to create a tablespace, which can contain
- one or more datafiles, providing storage space for tables. One
- datafile is created and added to the tablespace using this
- statement. Additional datafiles may be added to the tablespace
+ one or more data files, providing storage space for tables. One
+ data file is created and added to the tablespace using this
+ statement. Additional data files may be added to the tablespace
by using the <literal>ALTER TABLESPACE</literal> statement (see
<xref linkend="alter-tablespace"/>).
</para>
<para>
- A logfile group of one or more <literal>UNDO</literal> log files
+ A log file group of one or more <literal>UNDO</literal> log files
must be assigned to the tablespace to be created with the
<literal>USE LOGFILE GROUP</literal> clause.
<replaceable>logfile_group</replaceable> must be an existing
- logfile group created with <literal>CREATE LOGFILE
+ log file group created with <literal>CREATE LOGFILE
GROUP</literal> (see <xref linkend="create-logfile-group"/>).
- Multiple tablespaces may use the same logfile group for
+ Multiple tablespaces may use the same log file group for
<literal>UNDO</literal> logging.
</para>
@@ -4063,8 +4063,8 @@
<para>
The <literal>INITIAL_SIZE</literal> parameter sets the
- datafile's total size in bytes. Once the file has been created,
- its size cannot be changed; however, you can add more datafiles
+ data file's total size in bytes. Once the file has been created,
+ its size cannot be changed; however, you can add more data files
to the tablespace using <literal>ALTER TABLESPACE ... ADD
DATAFILE</literal>. See <xref linkend="alter-tablespace"/>.
</para>
@@ -4091,8 +4091,8 @@
<para>
When <literal>CREATE TABLESPACE</literal> is used with
<literal>ENGINE = NDB</literal>, a tablespace and associated
- datafile are created on each Cluster data node. You can verify
- that the datafiles were created and obtain information about
+ data file are created on each Cluster data node. You can verify
+ that the data files were created and obtain information about
them by querying the <literal>INFORMATION_SCHEMA.FILES</literal>
table. For example:
</para>
@@ -4460,21 +4460,21 @@
</programlisting>
<para>
- This statement drops the logfile group named
- <replaceable>logfile_group</replaceable>. The logfile group must
+ This statement drops the log file group named
+ <replaceable>logfile_group</replaceable>. The log file group must
already exist or an error results. (For information on creating
- logfile groups, see <xref linkend="create-logfile-group"/>.)
+ log file groups, see <xref linkend="create-logfile-group"/>.)
</para>
<para>
<emphasis role="bold">Important</emphasis>: Before dropping a
- logfile group, you must drop all tablespaces that use that
- logfile group for <literal>UNDO</literal> logging.
+ log file group, you must drop all tablespaces that use that
+ log file group for <literal>UNDO</literal> logging.
</para>
<para>
The required <literal>ENGINE</literal> clause provides the name
- of the storage engine used by the logfile group to be dropped.
+ of the storage engine used by the log file group to be dropped.
In MySQL 5.1, the only permitted values for
<replaceable>engine</replaceable> are <literal>NDB</literal> and
<literal>NDBCLUSTER</literal>.
@@ -4510,9 +4510,9 @@
<para>
<emphasis role="bold">Important</emphasis>: The tablespace to be
- dropped must not contain any datafiles; in other words, before
+ dropped must not contain any data files; in other words, before
you can drop a tablespace, you must first drop each of its
- datafiles using <literal>ALTER TABLESPACE ... DROP
+ data files using <literal>ALTER TABLESPACE ... DROP
DATAFILE</literal> (see <xref linkend="alter-tablespace"/>).
</para>
@@ -23376,7 +23376,7 @@
@node SHOW NEW MASTER, PURGE MASTER LOGS, SHOW BINLOG EVENTS,
Replication SQL @subsubsection @code{SHOW NEW MASTER FOR
SLAVE} @code{SHOW NEW MASTER FOR SLAVE WITH
- MASTER_LOG_FILE='@var{logfile}' AND MASTER_LOG_POS=@var{pos}
+ MASTER_LOG_FILE='@var{log file}' AND MASTER_LOG_POS=@var{pos}
AND MASTER_LOG_SEQ=@var{log_seq} AND
MASTER_SERVER_ID=@var{server_id}} This statement is used when
a slave of a possibly dead/unavailable master needs to be
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3923 - in trunk: refman-4.1 refman-5.0 refman-5.1 | jon | 13 Nov |
