Author: paul
Date: 2006-01-13 04:50:48 +0100 (Fri, 13 Jan 2006)
New Revision: 796
Log:
r6149@frost: paul | 2006-01-12 21:49:25 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/storage-engines.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.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.0/views.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/stored-procedures.xml
trunk/refman-5.1/views.xml
trunk/refman-common/news-4.0.xml
trunk/refman-common/news-4.1.xml
trunk/refman-common/news-5.0.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6148
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6149
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-4.1/apis.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -12465,7 +12465,7 @@
<literal>mysql_affected_rows()</literal> returns zero for
the number of records affected. In MySQL 4.0 and later,
<literal>DELETE</literal> always returns the correct
- number of rows deleted. For a fast recreate, use
+ number of rows deleted. For a fast re-create, use
<literal>TRUNCATE TABLE</literal>.
</para>
</listitem>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-4.1/database-administration.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -18237,8 +18237,8 @@
index. If keys are packed
(<literal>PACK_KEYS=1</literal>),
<command>myisamchk</command> must unpack key blocks
- first, then recreate indexes and pack the key blocks
- again. (In this case, recreating indexes is faster than
+ first, then re-create indexes and pack the key blocks
+ again. (In this case, re-creating indexes is faster than
updating offsets for each index.)
</para>
</listitem>
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-4.1/storage-engines.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -741,10 +741,21 @@
</itemizedlist>
<para>
- A forum dedicated to the <literal>MyISAM</literal> storage engine
- is available at <ulink url="&base-url-forum-list;?21"/>.
+ <emphasis role="bold">Additional resources</emphasis>
</para>
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ A forum dedicated to the <literal>MyISAM</literal> storage
+ engine is available at
+ <ulink url="&base-url-forum-list;?21"/>.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
<section id="myisam-start">
<title>&title-myisam-start;</title>
@@ -2424,10 +2435,21 @@
</itemizedlist>
<para>
- A forum dedicated to the <literal>MEMORY</literal> storage engine
- is available at <ulink url="&base-url-forum-list;?92"/>.
+ <emphasis role="bold">Additional resources</emphasis>
</para>
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ A forum dedicated to the <literal>MEMORY</literal> storage
+ engine is available at
+ <ulink url="&base-url-forum-list;?92"/>.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
</section>
<section id="bdb-storage-engine">
@@ -3410,8 +3432,8 @@
<ulink url="http://www.zlib.net/"/>). You can use
<literal>OPTIMIZE TABLE</literal> to analyze the table and pack it
into a smaller format (for a reason to use <literal>OPTIMIZE
- TABLE</literal>, see later in this section).
- There are several types of insertions that are used:
+ TABLE</literal>, see later in this section). There are several
+ types of insertions that are used:
</para>
<itemizedlist>
@@ -3459,10 +3481,21 @@
</para>
<para>
- A forum dedicated to the <literal>ARCHIVE</literal> storage engine
- is available at <ulink url="&base-url-forum-list;?112"/>.
+ <emphasis role="bold">Additional resources</emphasis>
</para>
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ A forum dedicated to the <literal>ARCHIVE</literal> storage
+ engine is available at
+ <ulink url="&base-url-forum-list;?112"/>.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
</section>
<section id="csv-storage-engine">
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/apis.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -12434,7 +12434,7 @@
</para>
<para>
- For a fast recreate, use <literal>TRUNCATE
+ For a fast re-create, use <literal>TRUNCATE
TABLE</literal>.
</para>
</listitem>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -6044,7 +6044,7 @@
dumped databases. The output generated by using
<option>---routines</option> contains <literal>CREATE
PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
- statements to recreate the routines. However, these
+ statements to re-create the routines. However, these
statements do not include attributes such as the routine
definer or the creation and modification timestamps. This
means that when the routines are reloaded, they will be
@@ -6053,7 +6053,7 @@
</para>
<para>
- If you require routines to be recreated with their
+ If you require routines to be re-created with their
original definer and timestamp attributes, do not use
<option>--routines</option>. Instead, dump and reload the
contents of the <literal>mysql.proc</literal> table
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/database-administration.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -20453,8 +20453,8 @@
index. If keys are packed
(<literal>PACK_KEYS=1</literal>),
<command>myisamchk</command> must unpack key blocks
- first, then recreate indexes and pack the key blocks
- again. (In this case, recreating indexes is faster than
+ first, then re-create indexes and pack the key blocks
+ again. (In this case, re-creating indexes is faster than
updating offsets for each index.)
</para>
</listitem>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/installing.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -12183,7 +12183,7 @@
<replaceable>raid_tbl</replaceable></literal> to create a
new tablefrom the <literal>RAID</literal> table. However,
the <literal>CREATE TABLE</literal> part of the statement
- must contain sufficient information to recreate column
+ must contain sufficient information to re-create column
attributes as well as indexes, or column attributes may be
lost and indexes will not appear in the new table. See
<xref linkend="create-table"/>.
@@ -12324,7 +12324,7 @@
<listitem>
<para>
- Start the server and recreate all triggers using the
+ Start the server and re-create all triggers using the
<filename>triggers.sql</filename> file: For example in
my case it was:
</para>
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/storage-engines.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -3998,10 +3998,10 @@
logged (and replicated to slave servers). This can be useful as a
repeater or filter mechanism. For example, suppose that your
application requires slave-side filtering rules, but transferring
- all binlog data to the slave first results in too much traffic. In
- such a case, it is possible to set up on the master host a
- <quote>dummy</quote> slave process whose default storage engine is
- <literal>BLACKHOLE</literal>, depicted as follows:
+ all binary log data to the slave first results in too much
+ traffic. In such a case, it is possible to set up on the master
+ host a <quote>dummy</quote> slave process whose default storage
+ engine is <literal>BLACKHOLE</literal>, depicted as follows:
</para>
<mediaobject>
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/stored-procedures.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -2165,7 +2165,7 @@
</para>
<para>
- First, the triggers that exist on a master must be recreated
+ First, the triggers that exist on a master must be re-created
on the slave server. Once this is done, the replication flow
works as any other standard DML statement that participates in
replication. For example, consider a table
Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.0/views.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -527,7 +527,7 @@
INVOKER</literal> clause and with a <literal>DEFINER</literal>
value that is the same as your account. However, because the
actual definer is unknown, MySQL issues a warning. To make the
- warning go away, it is sufficient to recreate the view so that the
+ warning go away, it is sufficient to re-create the view so that the
view definition includes a <literal>DEFINER</literal> clause.
</para>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.1/apis.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -12437,7 +12437,7 @@
</para>
<para>
- For a fast recreate, use <literal>TRUNCATE
+ For a fast re-create, use <literal>TRUNCATE
TABLE</literal>.
</para>
</listitem>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -6079,7 +6079,7 @@
dumped databases. The output generated by using
<option>---routines</option> contains <literal>CREATE
PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
- statements to recreate the routines. However, these
+ statements to re-create the routines. However, these
statements do not include attributes such as the routine
definer or the creation and modification timestamps. This
means that when the routines are reloaded, they will be
@@ -6088,7 +6088,7 @@
</para>
<para>
- If you require routines to be recreated with their
+ If you require routines to be re-created with their
original definer and timestamp attributes, do not use
<option>--routines</option>. Instead, dump and reload the
contents of the <literal>mysql.proc</literal> table
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.1/database-administration.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -20398,8 +20398,8 @@
index. If keys are packed
(<literal>PACK_KEYS=1</literal>),
<command>myisamchk</command> must unpack key blocks
- first, then recreate indexes and pack the key blocks
- again. (In this case, recreating indexes is faster than
+ first, then re-create indexes and pack the key blocks
+ again. (In this case, re-creating indexes is faster than
updating offsets for each index.)
</para>
</listitem>
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.1/stored-procedures.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -2132,7 +2132,7 @@
</para>
<para>
- First, the triggers that exist on a master must be recreated
+ First, the triggers that exist on a master must be re-created
on the slave server. Once this is done, the replication flow
works as any other standard DML statement that participates in
replication. For example, consider a table
Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-5.1/views.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -518,7 +518,7 @@
SECURITY INVOKER</literal> clause and with a
<literal>DEFINER</literal> value that is the same as your account.
However, because the actual definer is unknown, MySQL issues a
- warning. To make the warning go away, it is sufficient to recreate
+ warning. To make the warning go away, it is sufficient to re-create
the view so that the view definition includes a
<literal>DEFINER</literal> clause.
</para>
Modified: trunk/refman-common/news-4.0.xml
===================================================================
--- trunk/refman-common/news-4.0.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-common/news-4.0.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -619,7 +619,7 @@
4.1.8 - 4.1.10.) There is nothing wrong with the table, it is
mysqld that is in error. Workaround: wait that 4.0.25 or
4.1.11 is released before doing an upgrade, or dump the table
- and recreate it with any MySQL version >= 3.23.50 before
+ and re-create it with any MySQL version >= 3.23.50 before
upgrading to 4.0.23 or 4.0.24.
</para>
</listitem>
Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-common/news-4.1.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -4559,7 +4559,7 @@
InnoDB would refuse to use that table. There is nothing wrong
with the table, it is mysqld that is in error. Workaround:
wait that 4.1.11 is released before doing an upgrade, or dump
- the table and recreate it with any MySQL version >= 3.23.50
+ the table and re-create it with any MySQL version >= 3.23.50
before upgrading.
</para>
</listitem>
@@ -4713,8 +4713,8 @@
With a database was dropped with
<literal>lower_case_table_names=2</literal>, tables in the
database also were dropped but not being flushed properly from
- the table cache. If the database was recreated, the tables
- also would appear to have been recreated. (Bug #8355)
+ the table cache. If the database was re-created, the tables
+ also would appear to have been re-created. (Bug #8355)
</para>
</listitem>
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-01-13 03:50:08 UTC (rev 795)
+++ trunk/refman-common/news-5.0.xml 2006-01-13 03:50:48 UTC (rev 796)
@@ -1179,7 +1179,7 @@
The server could misinterpret old trigger definition files
created before MySQL 5.0.17. Now they are interpreted
correctly, but this takes more time and the server issues a
- warning that the trigger should be recreated. (Bug #14090)
+ warning that the trigger should be re-created. (Bug #14090)
</para>
</listitem>
@@ -1308,7 +1308,7 @@
<para>
A server crash could occur if a prepared statement invoked a
stored procedure that existed when the statement was prepared
- but had been dropped and recreated prior to statement
+ but had been dropped and re-created prior to statement
execution. (Bug #12329)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r796 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 13 Jan |
