| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | March 23 2007 6:41pm |
| Subject: | svn commit - mysqldoc@docsrva: r5531 - in trunk: . refman-5.0 refman-5.1 | ||
| View as plain text | |||
Author: paul Date: 2007-03-23 18:41:36 +0100 (Fri, 23 Mar 2007) New Revision: 5531 Log: r22151@polar: paul | 2007-03-23 12:39:46 -0500 5.0 doesn't have -max anymore: - Notes in 5.0.27, 5.0.28, 5.0.37 changelog sections. - Notes in upgrading section. - Update Cluster instructions that referred to -max. - Update Windows server sections that referred to mysqld-max, mysqld-nt-max. - Remove mysqld-max section, update xrefs, redirect page. Also made some 5.1 revisions re: Windows servers available, some other changes that were overlooked previously when -max was removed from 5.1. Modified: trunk/refman-5.0/apis-c.xml trunk/refman-5.0/client-utility-programs.xml trunk/refman-5.0/data-types.xml trunk/refman-5.0/database-administration.xml trunk/refman-5.0/extending-mysql.xml trunk/refman-5.0/faqs.xml trunk/refman-5.0/functions.xml trunk/refman-5.0/installing-cs.xml trunk/refman-5.0/mysql-cluster.xml trunk/refman-5.0/releasenotes-cs-5.0.xml trunk/refman-5.0/releasenotes-es-5.0.xml trunk/refman-5.0/renamed-nodes.txt trunk/refman-5.0/replication.xml trunk/refman-5.0/se-bdb.xml trunk/refman-5.0/se-blackhole.xml trunk/refman-5.0/se-csv.xml trunk/refman-5.0/se-example.xml trunk/refman-5.0/se-federated.xml trunk/refman-5.0/se-innodb.xml trunk/refman-5.0/storage-engines.xml trunk/refman-5.0/tutorial.xml trunk/refman-5.1/apis-c.xml trunk/refman-5.1/client-utility-programs.xml trunk/refman-5.1/data-types.xml trunk/refman-5.1/database-administration.xml trunk/refman-5.1/extending-mysql.xml trunk/refman-5.1/faqs.xml trunk/refman-5.1/functions.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/partitioning-guide.xml trunk/refman-5.1/replication-implementation.xml trunk/refman-5.1/replication-notes.xml trunk/refman-5.1/replication-solutions.xml trunk/refman-5.1/replication.xml trunk/refman-5.1/restrictions.xml trunk/refman-5.1/se-falcon.xml trunk/refman-5.1/se-federated.xml trunk/refman-5.1/stored-procedures.xml trunk/refman-5.1/triggers.xml trunk/refman-5.1/tutorial.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22143 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: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 Modified: trunk/refman-5.0/apis-c.xml =================================================================== --- trunk/refman-5.0/apis-c.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/apis-c.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 685 bytes @@ -8639,8 +8639,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-5.0/client-utility-programs.xml =================================================================== --- trunk/refman-5.0/client-utility-programs.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/client-utility-programs.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 14, Lines Deleted: 19; 2204 bytes @@ -5942,49 +5942,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> @@ -6019,12 +6015,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> Modified: trunk/refman-5.0/data-types.xml =================================================================== --- trunk/refman-5.0/data-types.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/data-types.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1586 bytes @@ -1272,8 +1272,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> @@ -3476,7 +3476,7 @@ INSERT INTO t1 VALUES (NOW()); INSERT INTO t2 VALUES (CURRENT_TIMESTAMP); </programlisting> - + <para> Note that <literal>TIMESTAMP</literal> columns are <literal>NOT NULL</literal> by default. @@ -5189,15 +5189,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-5.0/database-administration.xml =================================================================== --- trunk/refman-5.0/database-administration.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/database-administration.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 11, Lines Added: 14, Lines Deleted: 414; 17478 bytes @@ -121,21 +121,6 @@ <listitem> <para> <indexterm> - <primary><command>mysqld-max</command></primary> - </indexterm> - - <command>mysqld-max</command> - </para> - - <para> - A version of the server that includes additional features. See - <xref linkend="mysqld-max"/>. - </para> - </listitem> - - <listitem> - <para> - <indexterm> <primary><command>mysqld_safe</command></primary> </indexterm> @@ -144,8 +129,7 @@ <para> A server startup script. <command>mysqld_safe</command> - attempts to start <command>mysqld-max</command> if it exists, - and <command>mysqld</command> otherwise. See + attempts to start <command>mysqld</command>. See <xref linkend="mysqld-safe"/>. </para> </listitem> @@ -1203,7 +1187,7 @@ Enable support for named pipes. This option applies only on Windows NT, 2000, XP, and 2003 systems, and can be used only with the <command>mysqld-nt</command> and - <command>mysqld-max-nt</command> servers that support + <command>mysqld-debug</command> servers that support named-pipe connections. </para> </listitem> @@ -7516,8 +7500,8 @@ | innodb_data_file_path | ibdata1:10M:autoextend | | innodb_data_home_dir | | ... -| version | 5.0.19-Max | -| version_comment | MySQL Community Edition - Max (GPL) | +| version | 5.0.19 | +| version_comment | MySQL Community Edition - (GPL) | | version_compile_machine | i686 | | version_compile_os | pc-linux-gnu | | wait_timeout | 28800 | @@ -11482,391 +11466,6 @@ </section> - <section id="mysqld-max"> - - <title>The <command>mysqld-max</command> Extended MySQL Server</title> - - <remark role="todo"> - -max is dynamically linked to support dynamic loading? (that is - stated in UDF section, but not here) - </remark> - - <indexterm> - <primary><command>mysqld-max</command></primary> - </indexterm> - - <para> - A MySQL-Max server is a version of the <command>mysqld</command> - MySQL server that has been built to include additional features. - The MySQL-Max distribution to use depends on your platform: - </para> - - <itemizedlist> - - <listitem> - <para> - For Windows, MySQL binary distributions include both the - standard server (<literal>mysqld.exe</literal>) and the - MySQL-Max server (<command>mysqld-max.exe</command>), so no - special distribution is needed. Just use a regular Windows - distribution. See <xref linkend="windows-installation"/>. - </para> - </listitem> - - <listitem> - <para> - For Linux, if you install MySQL using RPM distributions, the - <literal>MySQL-Max</literal> RPM presupposes that you have - already installed the regular server RPM. Use the regular - <literal>MySQL-server</literal> RPM first to install a - standard server named <command>mysqld</command>, and then use - the <literal>MySQL-Max</literal> RPM to install a server named - <command>mysqld-max</command>. See - <xref linkend="linux-rpm"/>, for more information on the Linux - RPM packages. - </para> - </listitem> - - <listitem> - <para> - All other MySQL-Max distributions contain a single server that - is named <command>mysqld</command> but that has the additional - features included. - </para> - </listitem> - - </itemizedlist> - - <para> - You can find the MySQL-Max binaries on the MySQL AB Web site at - <ulink url="&base-url-downloads;"/>. - </para> - - <para> - MySQL AB builds the MySQL-Max servers by using the following - <command>configure</command> options: - </para> - - <itemizedlist> - - <listitem> - <para> - <option>--with-server-suffix=-max</option> - </para> - - <para> - This option adds a <literal>-max</literal> suffix to the - <command>mysqld</command> version string. - </para> - </listitem> - - <listitem> - <remark role="todo"> - [pd] Fix this when the 5.1 policy gets ironed out. - </remark> - - <para> - <option>--with-innodb</option> - </para> - - <para> - This option enables support for the <literal>InnoDB</literal> - storage engine. MySQL-Max servers always include - <literal>InnoDB</literal> support. From MySQL 4.0 onward, - <literal>InnoDB</literal> is included by default in all binary - distributions, so a MySQL-Max server is not needed to obtain - <literal>InnoDB</literal> support. - </para> - </listitem> - - <listitem> - <para> - <option>--with-bdb</option> - </para> - - <para> - This option enables support for the Berkeley DB - (<literal>BDB</literal>) storage engine on those platforms for - which <literal>BDB</literal> is available. (See notes in the - following discussion.) - </para> - </listitem> - - <listitem> - <para> - <option>--with-blackhole-storage-engine</option> - </para> - - <para> - This option enables support for the - <literal>BLACKHOLE</literal> storage engine. - </para> - </listitem> - - <listitem> - <para> - <option>--with-csv-storage-engine</option> - </para> - - <para> - This option enables support for the <literal>CSV</literal> - storage engine. - </para> - </listitem> - - <listitem> - <para> - <option>--with-example-storage-engine</option> - </para> - - <para> - This option enables support for the <literal>EXAMPLE</literal> - storage engine. - </para> - </listitem> - - <listitem> - <para> - <option>--with-federated-storage-engine</option> - </para> - - <para> - This option enables support for the - <literal>FEDERATED</literal> storage engine. - </para> - </listitem> - - <listitem> - <para> - <option>--with-ndbcluster</option> - </para> - - <para> - This option enables support for the <literal>NDB - Cluster</literal> storage engine on those platforms for which - Cluster is available. (See notes in the following discussion.) - </para> - </listitem> - - <listitem> - <para> - <literal>USE_SYMDIR</literal> - </para> - - <para> - This define is enabled to turn on database symbolic link - support for Windows. From MySQL 4.0 onward, symbolic link - support is enabled for all Windows servers, so a MySQL-Max - server is not needed to take advantage of this feature. - </para> - </listitem> - - </itemizedlist> - - <para> - MySQL-Max binary distributions are a convenience for those who - wish to install precompiled programs. If you build MySQL using a - source distribution, you can build your own Max-like server by - enabling the same features at configuration time that the - MySQL-Max binary distributions are built with. - </para> - - <para> - MySQL-Max servers include the <literal>BerkeleyDB</literal> - (<literal>BDB</literal>) storage engine whenever possible, but not - all platforms support <literal>BDB</literal>. - </para> - - <para> - Currently, MySQL Cluster is supported on Linux (on most - platforms), Solaris, Mac OS X, and HP-UX only. Some users have - reported success in using MySQL Cluster built from source on BSD - operating systems, but these are not officially supported at this - time. Note that, even for servers compiled with Cluster support, - the <literal>NDB Cluster</literal> storage engine is not enabled - by default. You must start the server with the - <option>--ndbcluster</option> option to use it as part of a MySQL - Cluster. (For details, see - <xref linkend="mysql-cluster-configuration"/>.) - </para> - - <para> - The following table shows the platforms for which MySQL-Max - binaries include support for <literal>BDB</literal> and - <literal>NDB Cluster</literal>. - </para> - - <informaltable> - <tgroup cols="3"> - <colspec colwidth="50*"/> - <colspec colwidth="25*"/> - <colspec colwidth="25*"/> - <tbody> - <row> - <entry><emphasis role="bold">System</emphasis></entry> - <entry><emphasis role="bold">BDB Support</emphasis></entry> - <entry><emphasis role="bold">NDB Support</emphasis></entry> - </row> - <row> - <entry>AIX 5.2</entry> - <entry>N</entry> - <entry>N</entry> - </row> - <row> - <entry>HP-UX</entry> - <entry>Y</entry> - <entry>Y</entry> - </row> - <row> - <entry>Linux-IA-64</entry> - <entry>N</entry> - <entry>Y</entry> - </row> - <row> - <entry>Linux-Intel</entry> - <entry>Y</entry> - <entry>Y</entry> - </row> - <row> - <entry>Mac OS X</entry> - <entry>N</entry> - <entry>Y</entry> - </row> - <row> - <entry>NetWare</entry> - <entry>N</entry> - <entry>N</entry> - </row> - <row> - <entry>SCO 6</entry> - <entry>N</entry> - <entry>N</entry> - </row> - <row> - <entry>Solaris-SPARC</entry> - <entry>Y</entry> - <entry>Y</entry> - </row> - <row> - <entry>Solaris-Intel</entry> - <entry>N</entry> - <entry>Y</entry> - </row> - <row> - <entry>Solaris-AMD 64</entry> - <entry>Y</entry> - <entry>Y</entry> - </row> - <row> - <entry>Windows NT/2000/XP</entry> - <entry>Y</entry> - <entry>N</entry> - </row> - </tbody> - </tgroup> - </informaltable> - - <remark> - Output for SHOW statement following is from 5.0.19-log - </remark> - - <para> - To find out which storage engines your server supports, use the - <literal>SHOW ENGINES</literal> statement. (See - <xref linkend="show-engines"/>.) For example: - </para> - -<programlisting> -mysql> <userinput>SHOW ENGINES\G</userinput> -*************************** 1. row *************************** - Engine: MyISAM -Support: DEFAULT -Comment: Default engine as of MySQL 3.23 with great performance -*************************** 2. row *************************** - Engine: MEMORY -Support: YES -Comment: Hash based, stored in memory, useful for temporary tables -*************************** 3. row *************************** - Engine: InnoDB -Support: YES -Comment: Supports transactions, row-level locking, and foreign keys -*************************** 4. row *************************** - Engine: BerkeleyDB -Support: NO -Comment: Supports transactions and page-level locking -*************************** 5. row *************************** - Engine: BLACKHOLE -Support: YES -Comment: /dev/null storage engine (anything you write to it disappears) -... -</programlisting> - - <para> - The precise output from <literal>SHOW ENGINES</literal> may vary - according to the MySQL version used (and the features that are - enabled). The <literal>Support</literal> values in the output - indicate the server's level of support for each feature, as shown - here: - </para> - - <informaltable> - <tgroup cols="2"> - <colspec colwidth="15*"/> - <colspec colwidth="85*"/> - <tbody> - <row> - <entry><emphasis role="bold">Value</emphasis></entry> - <entry><emphasis role="bold">Meaning</emphasis></entry> - </row> - <row> - <entry><literal>YES</literal></entry> - <entry>The feature is supported and is active.</entry> - </row> - <row> - <entry><literal>NO</literal></entry> - <entry>The feature is not supported.</entry> - </row> - <row> - <entry><literal>DISABLED</literal></entry> - <entry>The feature is supported but has been disabled.</entry> - </row> - </tbody> - </tgroup> - </informaltable> - - <para> - A value of <literal>NO</literal> means that the server was - compiled without support for the feature, so it cannot be - activated at runtime. - </para> - - <para> - A value of <literal>DISABLED</literal> occurs either because the - server was started with an option that disables the feature, or - because not all options required to enable it were given. In the - latter case, the error log file should contain a reason indicating - why the option is disabled. See <xref linkend="error-log"/>. - </para> - - <para> - You might also see <literal>DISABLED</literal> for a storage - engine if the server was compiled to support it, but was started - with a <option>--skip-<replaceable>engine</replaceable></option> - option. Only the <literal>InnoDB</literal>, - <literal>MERGE</literal> and <literal>BDB</literal> engines can be - disabled in this way. For the <literal>NDB Cluster</literal> - storage engine, <literal>DISABLED</literal> means the server was - compiled with support for MySQL Cluster, but was not started with - the <option>--ndb-cluster</option> option. - </para> - - <para> - All MySQL servers support <literal>MyISAM</literal> tables, - because <literal>MyISAM</literal> is the default storage engine. - </para> - - </section> - <section id="server-startup-programs"> <title>MySQL Server Startup Programs</title> @@ -11955,9 +11554,10 @@ </para> <para> - By default, <command>mysqld_safe</command> tries to start an - executable named <command>mysqld-max</command> if it exists, - and <command>mysqld</command> otherwise. Be aware of the + By default, <command>mysqld_safe</command> before MySQL + 5.0.27 tries to start an executable named + <command>mysqld-max</command> if it exists, and + <command>mysqld</command> otherwise. Be aware of the implications of this behavior: </para> @@ -12288,9 +11888,9 @@ option, but you specify only the suffix for the server program name. The basename is assumed to be <command>mysqld</command>. For example, if you use - <option>--mysqld-version=max</option>, + <option>--mysqld-version=debug</option>, <command>mysqld_safe</command> starts the - <command>mysqld-max</command> program in the + <command>mysqld-debug</command> program in the <literal>ledir</literal> directory. If the argument to <option>--mysqld-version</option> is empty, <command>mysqld_safe</command> uses @@ -13030,7 +12630,7 @@ <programlisting> [mysqld38] -mysqld = mysqld-max +mysqld = mysqld-debug ledir = /opt/local/mysql/libexec </programlisting> </listitem> @@ -28841,7 +28441,7 @@ <para> Suppose that you want to run <command>mysqld</command> on port 3307 with a data directory of <filename>C:\mydata1</filename>, - and <command>mysqld-max</command> on port 3308 with a data + and <command>mysqld-debug</command> on port 3308 with a data directory of <filename>C:\mydata2</filename>. (To do this, make sure that before you start the servers, each data directory exists and has its own copy of the @@ -28874,7 +28474,7 @@ <programlisting> C:\> <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput> -C:\> <userinput>C:\mysql\bin\mysqld-max --defaults-file=C:\my-opts2.cnf</userinput> +C:\> <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput> </programlisting> <para> @@ -28898,7 +28498,7 @@ over TCP/IP. If your version of Windows supports named pipes and you also want to allow named-pipe connections, use the <command>mysqld-nt</command> or - <command>mysqld-max-nt</command> servers and specify options + <command>mysqld-debug</command> server and specify options that enable the named pipe and specify its name. Each server that supports named-pipe connections must use a unique pipe name. For example, the <filename>C:\my-opts1.cnf</filename> Modified: trunk/refman-5.0/extending-mysql.xml =================================================================== --- trunk/refman-5.0/extending-mysql.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/extending-mysql.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 0, Lines Deleted: 6; 713 bytes @@ -668,12 +668,6 @@ </para> <para> - If you must use a precompiled distribution of MySQL, use - MySQL-Max, which contains a dynamically linked server that - supports dynamic loading. - </para> - - <para> For each function that you want to use in SQL statements, you should define corresponding C (or C++) functions. In the following discussion, the name <quote>xxx</quote> is used for an Modified: trunk/refman-5.0/faqs.xml =================================================================== --- trunk/refman-5.0/faqs.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/faqs.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 22, Lines Deleted: 20; 2976 bytes @@ -2254,18 +2254,18 @@ </itemizedlist> </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - The MySQL Network Monitoring and Advisory Service - enforces best practices for maximizing the security - of your servers. For more information see + The MySQL Network Monitoring and Advisory Service enforces + best practices for maximizing the security of your + servers. For more information see <ulink url="&base-url-enterprise;advisors.html"/>. </para> - + </formalpara> </answer> @@ -4023,13 +4023,13 @@ <answer> <para> - MySQL Cluster is supported in all MySQL-max binaries in the - ¤t-series; release series, except as noted in the - following paragraph. You can determine whether your server - has <literal>NDB</literal> support using either the - <literal>SHOW VARIABLES LIKE 'have_%'</literal> or - <literal>SHOW ENGINES</literal> statement. (See - <xref linkend="mysqld-max"/>, for more information.) + Cluster is supported in all server binaries in the + ¤t-series; release series for operating systems on + which MySQL Cluster is available. See + <xref linkend="mysqld"/>. You can determine whether your + server has NDB support using either the <literal>SHOW + VARIABLES LIKE 'have_%'</literal> or <literal>SHOW + ENGINES</literal> statement. </para> <para> @@ -4043,12 +4043,14 @@ <literal>-max</literal> binaries supplied as <filename>.tar.gz</filename> archives. This is still possible, but is not required, so you can use your Linux - distribution's RPM manager if you prefer.) You can also - obtain NDB support by compiling the <literal>-max</literal> - binaries from source, but it is not necessary to do so - simply to use MySQL Cluster. To download the latest binary, - RPM, or source distribution for MySQL ¤t-series;, - visit + distribution's RPM manager if you prefer.) + </para> + + <para> + You can also obtain NDB support by compiling MySQL from + source, but it is not necessary to do so simply to use MySQL + Cluster. To download the latest binary, RPM, or source + distribution in the MySQL ¤t-series; series, visit <ulink url="&base-url-downloads;mysql/¤t-series;.html"/>. </para> Modified: trunk/refman-5.0/functions.xml =================================================================== --- trunk/refman-5.0/functions.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/functions.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2442 bytes @@ -2506,15 +2506,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"/> @@ -15265,10 +15266,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-5.0/installing-cs.xml =================================================================== --- trunk/refman-5.0/installing-cs.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/installing-cs.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 11, Lines Added: 50, Lines Deleted: 63; 8374 bytes @@ -826,26 +826,19 @@ <listitem> <para> - To satisfy different user requirements, we provide two - different binary versions. One is compiled with the core - feature set. The other (MySQL-Max) is compiled with an - extended feature set. Both versions are compiled from the - same source distribution. All native MySQL clients can - connect to servers from either MySQL version. + To satisfy different user requirements, we provide several + servers in binary distributions. <command>mysqld</command> + is an optimized server that is a smaller, faster binary. + <command>mysqld-debug</command> is compiled with debugging + support. </para> <para> - The extended MySQL binary distribution is identified by the - <literal>-max</literal> suffix and is configured with the - same options as <command>mysqld-max</command>. See - <xref linkend="mysqld-max"/>. + Each of these servers is compiled from the same source + distribution, though with different configuration options. + All native MySQL clients can connect to servers from either + MySQL version. </para> - - <para> - For RPM distributions, if you want to use the - <literal>MySQL-Max</literal> RPM, you must first install the - standard <literal>MySQL-server</literal> RPM. - </para> </listitem> </itemizedlist> @@ -3463,9 +3456,10 @@ <title>Selecting a MySQL Server Type</title> &cs-only; + <para> The following table shows the available servers for Windows in - MySQL ¤t-series;: + MySQL ¤t-series;. </para> <informaltable> @@ -3478,29 +3472,18 @@ <entry><emphasis role="bold">Description</emphasis></entry> </row> <row> - <entry><command>mysqld-debug</command></entry> - <entry>Compiled with full debugging and automatic memory allocation checking, - as well as <literal>InnoDB</literal> and - <literal>BDB</literal> support.</entry> - </row> - <row> - <entry><command>mysqld</command></entry> - <entry>Optimized binary with <literal>InnoDB</literal> support.</entry> - </row> - <row> <entry><command>mysqld-nt</command></entry> <entry>Optimized binary for Windows NT, 2000, and XP with support for named - pipes.</entry> + pipes</entry> </row> <row> - <entry><command>mysqld-max</command></entry> - <entry>Optimized binary with <literal>InnoDB</literal> and - <literal>BDB</literal> support.</entry> + <entry><command>mysqld</command></entry> + <entry>Optimized binary without named pipe support (for Windows 95/ME)</entry> </row> <row> - <entry><command>mysqld-max-nt</command></entry> - <entry>Like <command>mysqld-max</command>, but compiled with support for named - pipes.</entry> + <entry><command>mysqld-debug</command></entry> + <entry>Like <command>mysqld-nt</command>, but compiled with full debugging and + automatic memory allocation checking</entry> </row> </tbody> </tgroup> @@ -3513,6 +3496,12 @@ </para> <para> + Each of the servers in a distribution support the same set of + storage engines. The <literal>SHOW ENGINES</literal> statement + displays which engines a given server supports. + </para> + + <para> All Windows MySQL ¤t-series; servers have support for symbolic linking of database directories. </para> @@ -3527,18 +3516,13 @@ <para> MySQL supports TCP/IP on all Windows platforms. The - <command>mysqld-nt</command> and <literal>mysql-max-nt</literal> + <command>mysqld-nt</command> and <literal>mysql-debug</literal> servers support named pipes on Windows NT, 2000, XP, and 2003. However, the default is to use TCP/IP regardless of platform. (Named pipes are slower than TCP/IP in many Windows configurations.) </para> - <remark> - WHEN IS THIS TRUE? CAN WE BE MORE SPECIFIC ABOUT WHEN NAMED - PIPES ARE SLOWER THAN TCP/IP? - </remark> - <para> Use of named pipes is subject to these conditions: </para> @@ -3558,8 +3542,8 @@ <listitem> <para> Named-pipe connections are allowed only by the - <command>mysqld-nt</command> or - <command>mysqld-max-nt</command> servers, and only if the + <command>mysqld-nt</command> and + <command>mysqld-debug</command> servers, and only if the server is run on a version of Windows that supports named pipes (NT, 2000, XP, 2003). </para> @@ -4976,12 +4960,7 @@ <literal>MySQL-server</literal> and <literal>MySQL-client</literal> packages to get a functional MySQL installation. The other packages are not required for a standard - installation. If you want to run a MySQL-Max server that has - additional capabilities, you should also install the - <literal>MySQL-Max</literal> RPM. However, you should do so only - <emphasis> after</emphasis> installing the - <literal>MySQL-server</literal> RPM. See - <xref linkend="mysqld-max"/>. + installation. </para> <remark role="todo"> @@ -5050,20 +5029,6 @@ <listitem> <para> - <literal>MySQL-Max-<replaceable>VERSION</replaceable>.i386.rpm</literal> - </para> - - <para> - The MySQL-Max server. This server has additional capabilities - that the one provided in the <literal>MySQL-server</literal> - RPM does not. You must install the - <literal>MySQL-server</literal> RPM first, because the - <literal>MySQL-Max</literal> RPM depends on it. - </para> - </listitem> - - <listitem> - <para> <literal>MySQL-client-<replaceable>VERSION</replaceable>.i386.rpm</literal> </para> @@ -9938,7 +9903,7 @@ This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to modify and redistribute it under the GPL license -Server version ¤t-version;-Max +Server version ¤t-version; Protocol version 10 Connection Localhost via UNIX socket UNIX socket /var/lib/mysql/mysql.sock @@ -11710,6 +11675,15 @@ <listitem> <para> + MySQL 5.0.27 is the last version in MySQL ¤t-series; for + which MySQL-Max binary distributions are provided, except for + RPM distributions. For RPMs, MySQL 5.0.37 is the last release. + After these versions, the features previously included in the + <command>mysqld-max</command> server are included in + <command>mysqld</command>. + </para> + + <para> If you previously installed a MySQL-Max distribution that includes a server named <command>mysqld-max</command>, and then upgrade later to a non-Max version of MySQL, @@ -12129,6 +12103,19 @@ </para> </listitem> + <listitem> + <para> + As of MySQL 5.0.28, <command>mysqld_safe</command> no longer + implicitly invokes <command>mysqld-max</command> if it + exists. Instead, it invokes <command>mysqld</command> unless + a <option>--mysqld</option> or + <option>--mysqld-version</option> option is given to specify + another server explicitly. If you previously relied on the + implicit invocation of <command>mysqld-max</command>, you + should use an appropriate option now. + </para> + </listitem> + </itemizedlist> <remark> Modified: trunk/refman-5.0/mysql-cluster.xml =================================================================== --- trunk/refman-5.0/mysql-cluster.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/mysql-cluster.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 13, Lines Added: 37, Lines Deleted: 44; 9216 bytes @@ -44,10 +44,7 @@ <literal>NDB Cluster</literal> storage engine to enable running several MySQL servers in a cluster. This storage engine is available in MySQL ¤t-series; binary releases and in RPMs compatible - with most modern Linux distributions. (If you install using RPM - files, note that both the <literal>mysql-server</literal> and - <literal>mysql-max</literal> RPMs must be installed to have MySQL - Cluster capability.) + with most modern Linux distributions. </para> <indexterm> @@ -1051,14 +1048,12 @@ applications, or configuration to support MySQL Cluster. For supported operating systems, a standard installation should be sufficient. The MySQL software requirements are simple: all that - is needed is a production release of MySQL-max ¤t-series;; - you must use the <literal>-max</literal> version of MySQL to - have Cluster support. (See <xref linkend="mysqld-max"/>.) It is - not necessary to compile MySQL yourself merely to be able to use - Cluster. In this How-To, we assume that you are using the - <literal>-max</literal> binary appropriate to your operating - system, available via the MySQL software downloads page at - <ulink url="&base-url-downloads;"/>. + is needed is a production release of MySQL ¤t-series; to + have Cluster support. It is not necessary to compile MySQL + yourself merely to be able to use Cluster. In this How-To, we + assume that you are using the server binary appropriate to your + operating system, available via the MySQL software downloads + page at <ulink url="&base-url-downloads;"/>. </para> <para> @@ -1138,12 +1133,13 @@ <para> Each MySQL Cluster host computer running data or SQL nodes must - have installed on it a MySQL-max binary. For management nodes, - it is not necessary to install the MySQL server binary, but you - do have to install the MGM server daemon and client binaries - (<command>ndb_mgmd</command> and <command>ndb_mgm</command>, - respectively). This section covers the steps necessary to - install the correct binaries for each type of Cluster node. + have installed on it a MySQL server binary. For management + nodes, it is not necessary to install the MySQL server binary, + but you do have to install the MGM server daemon and client + binaries (<command>ndb_mgmd</command> and + <command>ndb_mgm</command>, respectively). This section covers + the steps necessary to install the correct binaries for each + type of Cluster node. </para> <para> @@ -1151,7 +1147,7 @@ there is generally no need to compile these yourself. Therefore, the first step in the installation process for each cluster host is to download the file - <filename>mysql-max-¤t-version;-pc-linux-gnu-i686.tar.gz</filename> + <filename>mysql-¤t-version;-pc-linux-gnu-i686.tar.gz</filename> from the <ulink url="&base-url-downloads;">MySQL downloads area</ulink>. We assume that you have placed it in each machine's <filename>/var/tmp</filename> directory. (If you do @@ -1161,7 +1157,8 @@ <para> RPMs are also available for both 32-bit and 64-bit Linux - platforms. For a MySQL Cluster, four RPMs are required: + platforms. For a MySQL Cluster, three (possibly four) RPMs are + required: </para> <itemizedlist> @@ -1181,7 +1178,9 @@ example, <filename>MySQL-Max-¤t-version;-0.glibc23.i386.rpm</filename>), which provides a MySQL Server binary with clustering - support. + support. In MySQL ¤t-series;, this is needed only + through 5.0.37. After that, the regular server RPM provides + the server binary with clustering support. </para> </listitem> @@ -1297,16 +1296,15 @@ <para> Change location to the directory containing the downloaded file, unpack the archive, and create a symlink to the - <filename>mysql-max</filename> directory named - <filename>mysql</filename>. Note that the actual file and - directory names will vary according to the MySQL version - number. + <filename>mysql</filename> directory. Note that the actual + file and directory names will vary according to the MySQL + version number. </para> <programlisting> shell> <userinput>cd /var/tmp</userinput> -shell> <userinput>tar -C /usr/local -xzvf mysql-max-¤t-version;-pc-linux-gnu-i686.tar.gz</userinput> -shell> <userinput>ln -s /usr/local/mysql-max-¤t-version;-pc-linux-gnu-i686 /usr/local/mysql</userinput> +shell> <userinput>tar -C /usr/local -xzvf mysql-¤t-version;-pc-linux-gnu-i686.tar.gz</userinput> +shell> <userinput>ln -s /usr/local/mysql-¤t-version;-pc-linux-gnu-i686 /usr/local/mysql</userinput> </programlisting> </listitem> @@ -1387,20 +1385,19 @@ <para> On each machine to be used for hosting a cluster SQL node, - install the <emphasis role="bold">MySQL Max</emphasis> RPM by - executing the following command as the system root user, - replacing the name shown for the RPM as necessary to match the - name of the RPM downloaded from the MySQL AB web site: + install the MySQL RPM by executing the following command as the + system root user, replacing the name shown for the RPM as + necessary to match the name of the RPM downloaded from the MySQL + AB web site: </para> <programlisting> shell> <userinput>rpm -Uhv MySQL-server-¤t-version;-0.glibc23.i386.rpm</userinput> -shell> <userinput>rpm -Uhv MySQL-Max-¤t-version;-0.glibc23.i386.rpm</userinput> </programlisting> <para> - This installs the MySQL Max server binary - (<command>mysqld-max</command>) in the + This installs the MySQL server binary + (<command>mysqld</command>) in the <filename>/usr/sbin</filename> directory, as well as all needed MySQL Server support files. It also installs the <command>mysql.server</command> and @@ -1833,11 +1830,7 @@ If you used RPM files to install MySQL on the cluster host where the SQL node is to reside, you can (and should) use the supplied startup script to start the MySQL server - process on the SQL node. As mention previously, you must - install the <emphasis role="bold">Server / Max</emphasis> - RPM <emphasis>in addition to</emphasis> the - <emphasis role="bold">Server</emphasis> RPM to obtain and - run the <command>mysqld-max</command> server binary. + process on the SQL node. </para> </listitem> @@ -2645,7 +2638,7 @@ <programlisting> shell> <userinput>mysql</userinput> Welcome to the MySQL monitor. Commands end with ; or \g. -Your MySQL connection id is 1 to server version: ¤t-version;-Max +Your MySQL connection id is 1 to server version: ¤t-version; Type 'help;' or '\h' for help. Type '\c' to clear the buffer. @@ -3053,8 +3046,8 @@ <listitem> <para> <literal>[SHM]</literal>: Defines shared-memory - connections between nodes. In MySQL ¤t-series;-max, - it is enabled by default, but should still be considered + connections between nodes. In MySQL ¤t-series;, it + is enabled by default, but should still be considered experimental. For a discussion of SHM interconnects, see <xref linkend="mysql-cluster-shm-definition"/>. </para> @@ -6826,7 +6819,7 @@ <filename>config.ini</filename> file explicitly define SCI (Scalable Coherent Interface) connections between cluster nodes. Using SCI transporters in MySQL Cluster is supported - only when the MySQL-Max binaries are built using + only when the MySQL binaries are built using <option>--with-ndb-sci=<replaceable>/your/path/to/SCI</replaceable></option>. The <replaceable>path</replaceable> should point to a directory that contains at a minimum <filename>lib</filename> @@ -8801,7 +8794,7 @@ process. To be used with MySQL Cluster, <command>mysqld</command> needs to be built with support for the <literal>NDB Cluster</literal> storage engine, as it is in the - precompiled <literal>-max</literal> binaries available from + precompiled binaries available from <ulink url="&base-url-downloads;"/>. If you build MySQL from source, you must invoke <command>configure</command> with the <option>--with-ndbcluster</option> option to enable <literal>NDB Modified: trunk/refman-5.0/releasenotes-cs-5.0.xml =================================================================== --- trunk/refman-5.0/releasenotes-cs-5.0.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/releasenotes-cs-5.0.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 4, Lines Added: 28, Lines Deleted: 4; 2138 bytes @@ -48,6 +48,14 @@ <listitem> <para> + This is the last version for which MySQL-Max RPM distributions + are available. (This change was already made for non-RPM + binary distributions in 5.0.27.) + </para> + </listitem> + + <listitem> + <para> Added the <literal>SHOW PROFILES</literal> and <literal>SHOW PROFILE</literal> statements to display statement profile data, and the accompanying @@ -64,8 +72,8 @@ <para> Added the <literal>Uptime_since_flush_status</literal> status variable, which indicates the number of seconds since the most - recent <literal>FLUSH STATUS</literal> statement. (From - Jeremy Cole) (Bug #24822) + recent <literal>FLUSH STATUS</literal> statement. (From Jeremy + Cole) (Bug #24822) </para> </listitem> @@ -2166,8 +2174,8 @@ View columns were always handled as having implicit derivation, leading to <literal>illegal mix of collation errors</literal> for some views in <literal>UNION</literal> - operations. Now view column derivation comes from the - original expression given in the view definition. (Bug #21505) + operations. Now view column derivation comes from the original + expression given in the view definition. (Bug #21505) </para> </listitem> @@ -3164,6 +3172,22 @@ </para> <para> + Functionality added or changed: + </para> + + <itemizedlist> + + <listitem> + <para> + This is the last version for which binary MySQL-Max + distributions are available, except for RPM distributions. + (For RPM distributions, the last version is 5.0.37.) + </para> + </listitem> + + </itemizedlist> + + <para> Bugs fixed: </para> Modified: trunk/refman-5.0/releasenotes-es-5.0.xml =================================================================== --- trunk/refman-5.0/releasenotes-es-5.0.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/releasenotes-es-5.0.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 19, Lines Deleted: 0; 855 bytes @@ -4107,6 +4107,25 @@ </para> <para> + Functionality added or changed: + </para> + + <itemizedlist> + + <listitem> + <para> + Binary MySQL distributions no longer include a + <command>mysqld-max</command> server, except for RPM + distributions. Instead, distributions contain a + <command>mysqld</command> binary that includes the features + previously included in the <command>mysqld-max</command> + binary. + </para> + </listitem> + + </itemizedlist> + + <para> Bugs fixed: </para> Modified: trunk/refman-5.0/renamed-nodes.txt =================================================================== --- trunk/refman-5.0/renamed-nodes.txt 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/renamed-nodes.txt 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 483 bytes @@ -654,3 +654,4 @@ rts-threads http://dev.mysql.com/doc/internals/en/rts-threads thread-packages http://dev.mysql.com/doc/internals/en/thread-packages tips miscellaneous-optimization-tips +mysqld-max mysqld Modified: trunk/refman-5.0/replication.xml =================================================================== --- trunk/refman-5.0/replication.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/replication.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 895 bytes @@ -1707,10 +1707,10 @@ <para> The <literal>USER()</literal>, <literal>CURRENT_USER()</literal>, - <literal>UUID()</literal>, - <literal>VERSION()</literal>, and - <literal>LOAD_FILE()</literal> functions are replicated - without change and thus do not work reliably on the slave. + <literal>UUID()</literal>, <literal>VERSION()</literal>, + and <literal>LOAD_FILE()</literal> functions are + replicated without change and thus do not work reliably on + the slave. </para> </listitem> Modified: trunk/refman-5.0/se-bdb.xml =================================================================== --- trunk/refman-5.0/se-bdb.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-bdb.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 5, Lines Deleted: 9; 1497 bytes @@ -43,11 +43,9 @@ <para> Support for the <literal>BDB</literal> storage engine is included in - MySQL source distributions is activated in MySQL-Max binary - distributions. The MySQL source distribution comes with a - <literal>BDB</literal> distribution that is patched to make it work - with MySQL. You cannot use a non-patched version of - <literal>BDB</literal> with MySQL. + MySQL source distributions, which come with a <literal>BDB</literal> + distribution that is patched to make it work with MySQL. You cannot + use a non-patched version of <literal>BDB</literal> with MySQL. </para> <remark> @@ -206,8 +204,7 @@ <para> If you have downloaded a binary version of MySQL that includes support for Berkeley DB, simply follow the usual binary - distribution installation instructions. (MySQL-Max distributions - include <literal>BDB</literal> support.) + distribution installation instructions. </para> <para> @@ -225,8 +222,7 @@ </programlisting> <para> - For more information, see <xref linkend="mysqld-max"/>, - <xref linkend="installing-binary"/>, and + For more information, <xref linkend="installing-binary"/>, and <xref linkend="installing-source"/>. </para> Modified: trunk/refman-5.0/se-blackhole.xml =================================================================== --- trunk/refman-5.0/se-blackhole.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-blackhole.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 867 bytes @@ -41,10 +41,10 @@ </programlisting> <para> - The <literal>BLACKHOLE</literal> storage engine is included in - MySQL-Max binary distributions. To enable this storage engine if you - build MySQL from source, invoke <command>configure</command> with - the <option>--with-blackhole-storage-engine</option> option. + The <literal>BLACKHOLE</literal> storage engine is included in MySQL + binary distributions. To enable this storage engine if you build + MySQL from source, invoke <command>configure</command> with the + <option>--with-blackhole-storage-engine</option> option. </para> <para> Modified: trunk/refman-5.0/se-csv.xml =================================================================== --- trunk/refman-5.0/se-csv.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-csv.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 776 bytes @@ -29,9 +29,10 @@ </para> <para> - The <literal>CSV</literal> storage engine is included in MySQL-Max - binary distributions. To enable this storage engine if you build - MySQL from source, invoke <command>configure</command> with the + The <literal>CSV</literal> storage engine is included in MySQL + binary distributions (except on Windows). To enable this storage + engine if you build MySQL from source, invoke + <command>configure</command> with the <option>--with-csv-storage-engine</option> option. </para> Modified: trunk/refman-5.0/se-example.xml =================================================================== --- trunk/refman-5.0/se-example.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-example.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 845 bytes @@ -30,10 +30,10 @@ </para> <para> - The <literal>EXAMPLE</literal> storage engine is included in - MySQL-Max binary distributions. To enable this storage engine if you - build MySQL from source, invoke <command>configure</command> with - the <option>--with-example-storage-engine</option> option. + The <literal>EXAMPLE</literal> storage engine is included in MySQL + binary distributions. To enable this storage engine if you build + MySQL from source, invoke <command>configure</command> with the + <option>--with-example-storage-engine</option> option. </para> <para> Modified: trunk/refman-5.0/se-federated.xml =================================================================== --- trunk/refman-5.0/se-federated.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-federated.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 859 bytes @@ -29,10 +29,10 @@ </para> <para> - The <literal>FEDERATED</literal> storage engine is included in - MySQL-Max binary distributions. To enable this storage engine if you - build MySQL from source, invoke <command>configure</command> with - the <option>--with-federated-storage-engine</option> option. + The <literal>FEDERATED</literal> storage engine is included in MySQL + binary distributions. To enable this storage engine if you build + MySQL from source, invoke <command>configure</command> with the + <option>--with-federated-storage-engine</option> option. </para> <para> Modified: trunk/refman-5.0/se-innodb.xml =================================================================== --- trunk/refman-5.0/se-innodb.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/se-innodb.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 764 bytes @@ -2919,8 +2919,8 @@ at all. MySQL replication is based on the binary log where MySQL writes SQL statements that modify data. A transaction that fails (for example, because of a foreign key violation, or because it - is rolled back) is not written to the binary log, so it is - not sent to slaves. See <xref linkend="commit"/>. + is rolled back) is not written to the binary log, so it is not + sent to slaves. See <xref linkend="commit"/>. </para> </section> Modified: trunk/refman-5.0/storage-engines.xml =================================================================== --- trunk/refman-5.0/storage-engines.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/storage-engines.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 6, Lines Deleted: 7; 1627 bytes @@ -123,12 +123,11 @@ <listitem> <para> The <literal>InnoDB</literal> and <literal>BDB</literal> storage - engines provide transaction-safe tables. <literal>BDB</literal> - is included in MySQL-Max binary distributions on those operating - systems that support it. <literal>InnoDB</literal> is also - included by default in all MySQL ¤t-series; binary - distributions. In source distributions, you can enable or - disable either engine by configuring MySQL as you like. + engines provide transaction-safe tables. + <literal>InnoDB</literal> is included by default in all MySQL + ¤t-series; binary distributions. In source distributions, + you can enable or disable either engine by configuring MySQL as + you like. </para> </listitem> @@ -148,7 +147,7 @@ <para> <literal>NDB Cluster</literal> is the storage engine used by MySQL Cluster to implement tables that are partitioned over many - computers. It is available in MySQL-Max ¤t-series; binary + computers. It is available in MySQL ¤t-series; binary distributions. This storage engine is currently supported on a number of Unix platforms. We intend to add support for this engine on other platforms, including Windows, in future MySQL Modified: trunk/refman-5.0/tutorial.xml =================================================================== --- trunk/refman-5.0/tutorial.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.0/tutorial.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 9, Lines Deleted: 13; 1582 bytes @@ -2896,7 +2896,7 @@ <primary>files</primary> <secondary>script</secondary> </indexterm> - + <indexterm> <primary>executing SQL statements from text files</primary> </indexterm> @@ -3052,23 +3052,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> @@ -3078,12 +3074,12 @@ by using the <literal>source</literal> command or <literal>\.</literal> command: </para> - + <programlisting> mysql> <userinput>source <replaceable>filename</replaceable>;</userinput> mysql> <userinput>\. <replaceable>filename</replaceable></userinput> </programlisting> - + <para> See <xref linkend="batch-commands"/>, for more information. </para> Modified: trunk/refman-5.1/apis-c.xml =================================================================== --- trunk/refman-5.1/apis-c.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/apis-c.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 6, Lines Deleted: 7; 1589 bytes @@ -3837,12 +3837,11 @@ <para> In MySQL 5.1.12 and later, mysql_insert_id() returns the - <emphasis role="bold">first</emphasis> - automatically generated <literal>AUTO_INCREMENT</literal> - value that was <emphasis>successfully</emphasis> inserted. - In MySQL 5.1.11 and earlier, - <literal>mysql_insert_id()</literal> returns the <emphasis role="bold">first</emphasis> automatically + generated <literal>AUTO_INCREMENT</literal> value that was + <emphasis>successfully</emphasis> inserted. In MySQL 5.1.11 + and earlier, <literal>mysql_insert_id()</literal> returns + the <emphasis role="bold">first</emphasis> automatically generated <literal>AUTO_INCREMENT</literal> value, regardless of whether the insertion of that value was successful. @@ -8747,8 +8746,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-5.1/client-utility-programs.xml =================================================================== --- trunk/refman-5.1/client-utility-programs.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/client-utility-programs.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 13, Lines Deleted: 18; 2088 bytes @@ -5929,47 +5929,43 @@ <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> - 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> @@ -6009,9 +6005,8 @@ <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> Modified: trunk/refman-5.1/data-types.xml =================================================================== --- trunk/refman-5.1/data-types.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/data-types.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1586 bytes @@ -1216,8 +1216,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> @@ -3347,7 +3347,7 @@ INSERT INTO t1 VALUES (NOW()); INSERT INTO t2 VALUES (CURRENT_TIMESTAMP); </programlisting> - + <para> Note that <literal>TIMESTAMP</literal> columns are <literal>NOT NULL</literal> by default. @@ -4939,15 +4939,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-5.1/database-administration.xml =================================================================== --- trunk/refman-5.1/database-administration.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/database-administration.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 9, Lines Deleted: 7; 1756 bytes @@ -1231,8 +1231,9 @@ <para> Enable support for named pipes. This option applies only on Windows NT, 2000, XP, and 2003 systems, and can be used - only with the <command>mysqld-nt</command> and server that - supports named-pipe connections. + only with the <command>mysqld-nt</command> and + <literal>mysqld-debug</literal> servers that support + named-pipe connections. </para> </listitem> @@ -29680,11 +29681,12 @@ Servers configured as just described allow clients to connect over TCP/IP. If your version of Windows supports named pipes and you also want to allow named-pipe connections, use the - <command>mysqld-nt</command> server and specify options that - enable the named pipe and specify its name. Each server that - supports named-pipe connections must use a unique pipe name. - For example, the <filename>C:\my-opts1.cnf</filename> file - might be written like this: + <command>mysqld-nt</command> or + <command>mysqld-debug</command> server and specify options + that enable the named pipe and specify its name. Each server + that supports named-pipe connections must use a unique pipe + name. For example, the <filename>C:\my-opts1.cnf</filename> + file might be written like this: </para> <programlisting> Modified: trunk/refman-5.1/extending-mysql.xml =================================================================== --- trunk/refman-5.1/extending-mysql.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/extending-mysql.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 7, Lines Deleted: 8; 1011 bytes @@ -145,18 +145,17 @@ connection, <literal>INSERT DELAYED</literal>, replication threads, and event threads. </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - For expert advice on thread management subscribe to - the MySQL Network Monitoring and Advisory Service. For more - information see, - <ulink url="&base-url-enterprise;advisors.html" />. + For expert advice on thread management subscribe to the MySQL + Network Monitoring and Advisory Service. For more information + see, <ulink url="&base-url-enterprise;advisors.html" />. </para> - + </formalpara> </section> Modified: trunk/refman-5.1/faqs.xml =================================================================== --- trunk/refman-5.1/faqs.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/faqs.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 4, Lines Added: 33, Lines Deleted: 28; 3955 bytes @@ -311,20 +311,20 @@ Cluster; <literal>NDB</literal> is covered in <xref linkend="mysql-cluster"/>. </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - For expert advice about the storage engine(s) most suitable to - your circumstances subscribe to the MySQL Network - Monitoring and Advisory Service. For more information see + For expert advice about the storage engine(s) most + suitable to your circumstances subscribe to the MySQL + Network Monitoring and Advisory Service. For more + information see <ulink url="&base-url-enterprise;advisors.html" />. </para> - + </formalpara> - </answer> @@ -2298,20 +2298,19 @@ </itemizedlist> </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - The MySQL Network Monitoring and Advisory Service - enforces best practices for maximizing the security - of your servers. For more information see + The MySQL Network Monitoring and Advisory Service enforces + best practices for maximizing the security of your + servers. For more information see <ulink url="&base-url-enterprise;advisors.html"/>. </para> - + </formalpara> - </answer> @@ -3703,35 +3702,39 @@ </answer> </qandaentry> - + <qandaentry> + <question> + <para> What filesystems can I use with MySQL Cluster? What about network filesystems or network shares? </para> + </question> - + <answer> + <para> Generally, any filesystem that is native to the host operating system should work well with MySQL Cluster. If you - find that a given filesystem works particularly well (or - not so especially well) with MySQL Cluster, we invite you to - discuss your findings in the + find that a given filesystem works particularly well (or not + so especially well) with MySQL Cluster, we invite you to + discuss your findings in the <ulink url="&base-url-forum-list;?25">MySQL Cluster - Forums</ulink>. + Forums</ulink>. </para> - + <para> - We do not test MySQL Cluster with <literal>FAT</literal> - or <literal>VFAT</literal> filesystems on Linux. Because of + We do not test MySQL Cluster with <literal>FAT</literal> or + <literal>VFAT</literal> filesystems on Linux. Because of this, and due to the fact that these are not very useful for any purpose other than sharing disk partitions between Linux - and Windows operating systems on multi-boot computers, we - do not recommend their use with MySQL Cluster. + and Windows operating systems on multi-boot computers, we do + not recommend their use with MySQL Cluster. </para> - + <para> MySQL Cluster is implemented as a shared-nothing solution; the idea behind this is that the failure of a single piece @@ -3741,7 +3744,9 @@ filesystems is not supported for MySQL Cluster. This also applies to shared storage devices such as SANs. </para> + </answer> + </qandaentry> <qandaentry> Modified: trunk/refman-5.1/functions.xml =================================================================== --- trunk/refman-5.1/functions.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/functions.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2443 bytes @@ -2477,15 +2477,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"/> @@ -15825,10 +15826,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-5.1/information-schema.xml =================================================================== --- trunk/refman-5.1/information-schema.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/information-schema.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 913 bytes @@ -4373,8 +4373,8 @@ <emphasis role="bold">Important</emphasis>: The times displayed by the <literal>STARTS</literal>, <literal>ENDS</literal>, and <literal>LAST_EXECUTED</literal> columns are currently given in - terms of Universal Time (GMT or UTC), regardless of the - server's time zone setting. (The same is true for the + terms of Universal Time (GMT or UTC), regardless of the server's + time zone setting. (The same is true for the <literal>starts</literal>, <literal>ends</literal>, and <literal>last_executed</literal> columns of the <literal>mysql.event</literal> table and the Modified: trunk/refman-5.1/installing.xml =================================================================== --- trunk/refman-5.1/installing.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/installing.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 5, Lines Added: 21, Lines Deleted: 19; 3538 bytes @@ -4268,7 +4268,7 @@ <para> The following table shows the available servers for Windows in - MySQL ¤t-series;: + MySQL ¤t-series;. </para> <informaltable> @@ -4281,18 +4281,18 @@ <entry><emphasis role="bold">Description</emphasis></entry> </row> <row> - <entry><command>mysqld-debug</command></entry> - <entry>Compiled with full debugging and automatic memory allocation checking, - as well as <literal>InnoDB</literal> support.</entry> + <entry><command>mysqld-nt</command></entry> + <entry>Optimized binary for Windows NT, 2000, and XP with support for named + pipes</entry> </row> <row> <entry><command>mysqld</command></entry> - <entry>Optimized binary with <literal>InnoDB</literal> support.</entry> + <entry>Optimized binary without named pipe support (for Windows 95/ME)</entry> </row> <row> - <entry><command>mysqld-nt</command></entry> - <entry>Optimized binary for Windows NT, 2000, and XP with support for named - pipes.</entry> + <entry><command>mysqld-debug</command></entry> + <entry>Like <command>mysqld-nt</command>, but compiled with full debugging and + automatic memory allocation checking</entry> </row> </tbody> </tgroup> @@ -4305,6 +4305,12 @@ </para> <para> + Each of the servers in a distribution support the same set of + storage engines. The <literal>SHOW ENGINES</literal> statement + displays which engines a given server supports. + </para> + + <para> All Windows MySQL ¤t-series; servers have support for symbolic linking of database directories. </para> @@ -4318,18 +4324,13 @@ </indexterm> <para> - MySQL supports TCP/IP on all Windows platforms. The - <command>mysqld-nt</command> server supports named pipes on - Windows NT, 2000, XP, and 2003. However, the default is to use + MySQL supports TCP/IP on all Windows platforms. MySQL servers on + Windows support named pipes on Windows NT, 2000, XP, and 2003 as + indicated in the following list. However, the default is to use TCP/IP regardless of platform. (Named pipes are slower than TCP/IP in many Windows configurations.) </para> - <remark> - WHEN IS THIS TRUE? CAN WE BE MORE SPECIFIC ABOUT WHEN NAMED - PIPES ARE SLOWER THAN TCP/IP? - </remark> - <para> Use of named pipes is subject to these conditions: </para> @@ -4349,9 +4350,10 @@ <listitem> <para> Named-pipe connections are allowed only by the - <command>mysqld-nt</command> server, and only if the server - is run on a version of Windows that supports named pipes - (NT, 2000, XP, 2003). + <command>mysqld-nt</command> and + <command>mysqld-debug</command> servers, and only if the + server is run on a version of Windows that supports named + pipes (NT, 2000, XP, 2003). </para> </listitem> Modified: trunk/refman-5.1/mysql-cluster.xml =================================================================== --- trunk/refman-5.1/mysql-cluster.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/mysql-cluster.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 4, Lines Added: 10, Lines Deleted: 20; 2917 bytes @@ -1084,7 +1084,7 @@ <para> RPMs are also available for both 32-bit and 64-bit Linux - platforms. For a MySQL Cluster, four RPMs are required: + platforms. For a MySQL Cluster, three RPMs are required: </para> <itemizedlist> @@ -1094,22 +1094,13 @@ The <emphasis role="bold">Server</emphasis> RPM (for example, <filename>MySQL-server-¤t-version;-0.glibc23.i386.rpm</filename>), - which supplies the core files needed to run a MySQL Server. + which supplies the core files needed to run a MySQL Server + and a MySQL Server binary with clustering support. </para> </listitem> <listitem> <para> - The <emphasis role="bold">Server/Max</emphasis> RPM (for - example, - <filename>MySQL-Max-¤t-version;-0.glibc23.i386.rpm</filename>), - which provides a MySQL Server binary with clustering - support. - </para> - </listitem> - - <listitem> - <para> The <emphasis role="bold">NDB Cluster - Storage engine</emphasis> RPM (for example, <filename>MySQL-ndb-storage-¤t-version;-0.glibc23.i386.rpm</filename>), @@ -1220,9 +1211,9 @@ <para> Change location to the directory containing the downloaded file, unpack the archive, and create a symlink to the - <filename>mysql</filename>. Note that the actual file and - directory names will vary according to the MySQL version - number. + <filename>mysql</filename> directory. Note that the actual + file and directory names will vary according to the MySQL + version number. </para> <programlisting> @@ -1309,15 +1300,14 @@ <para> On each machine to be used for hosting a cluster SQL node, - install the <emphasis role="bold">MySQL Max</emphasis> RPM by - executing the following command as the system root user, - replacing the name shown for the RPM as necessary to match the - name of the RPM downloaded from the MySQL AB web site: + install the MySQL RPM by executing the following command as the + system root user, replacing the name shown for the RPM as + necessary to match the name of the RPM downloaded from the MySQL + AB web site: </para> <programlisting> shell> <userinput>rpm -Uhv MySQL-server-¤t-version;-0.glibc23.i386.rpm</userinput> -shell> <userinput>rpm -Uhv MySQL-Max-¤t-version;-0.glibc23.i386.rpm</userinput> </programlisting> <para> Modified: trunk/refman-5.1/partitioning-guide.xml =================================================================== --- trunk/refman-5.1/partitioning-guide.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/partitioning-guide.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 6, Lines Added: 10, Lines Deleted: 10; 2104 bytes @@ -159,10 +159,9 @@ </para> <formalpara> + <title>Data Managament</title> - - <para> Because partitioning allows you to choose where data goes according to criteria that you define, you can determine what @@ -174,6 +173,7 @@ critical applications. (For information on reorganising MySQL partitioned tables, see <xref linkend="pg-management"/>). </para> + </formalpara> <para> @@ -188,10 +188,9 @@ </para> <formalpara> + <title>Availability</title> - - <para> Because data can easily be stored across multiple disks or other storage devices, it provides for future expansion in a seamless @@ -207,6 +206,7 @@ table into a partitioned table, or to remove partitioning from a partitioned table without losing data or impacting availability. </para> + </formalpara> <para> @@ -220,17 +220,16 @@ <para> You can also place your most critical data on highly available - storage media, and less important data on devices which do - not necessarily guarantee the same level of reliability (and so - are not as costly). This can help to make hardware expenditures - more effective. + storage media, and less important data on devices which do not + necessarily guarantee the same level of reliability (and so are + not as costly). This can help to make hardware expenditures more + effective. </para> <formalpara> + <title>Performance</title> - - <para> With the right indexes applied to a partitioned table, queries against this table can find desired records more quickly, due to @@ -239,6 +238,7 @@ performing a full table scan (that is, searching through the entire table). </para> + </formalpara> <para> Modified: trunk/refman-5.1/replication-implementation.xml =================================================================== --- trunk/refman-5.1/replication-implementation.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/replication-implementation.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 732 bytes @@ -76,8 +76,8 @@ </para> <para> - Databases and tables are updated on the slave according to a set - of rules that are applied according to the various configuration + Databases and tables are updated on the slave according to a set of + rules that are applied according to the various configuration options and variables that control statement evaluation. For details on how these rules are applied, see <xref Modified: trunk/refman-5.1/replication-notes.xml =================================================================== --- trunk/refman-5.1/replication-notes.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/replication-notes.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 13, Lines Deleted: 15; 2001 bytes @@ -317,8 +317,7 @@ <para> The <literal>USER()</literal>, <literal>CURRENT_USER()</literal>, - <literal>UUID()</literal>, - <literal>VERSION()</literal>, and + <literal>UUID()</literal>, <literal>VERSION()</literal>, and <literal>LOAD_FILE()</literal> functions are replicated without change and thus do not work reliably on the slave unless row-based replication is enabled. (See @@ -531,18 +530,18 @@ might need to create a non-existent table) and run <literal>START SLAVE</literal>. </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> For instant notification when a slave thread terminates - subscribe to the MySQL Network Monitoring and Advisory Service. - For more information see + subscribe to the MySQL Network Monitoring and Advisory + Service. For more information see <ulink url="&base-url-enterprise;advisors.html"/>. </para> - + </formalpara> </section> @@ -974,18 +973,17 @@ <section id="replication-faq"> <title>Replication FAQ</title> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - For expert advice on replication subscribe to - the MySQL Network Monitoring and Advisory Service. For more - information see + For expert advice on replication subscribe to the MySQL Network + Monitoring and Advisory Service. For more information see <ulink url="&base-url-enterprise;advisors.html" />. </para> - + </formalpara> <qandaset> Modified: trunk/refman-5.1/replication-solutions.xml =================================================================== --- trunk/refman-5.1/replication-solutions.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/replication-solutions.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 2, Lines Added: 12, Lines Deleted: 12; 2219 bytes @@ -199,16 +199,16 @@ <title>Backing up raw data</title> <para> - To guarantee the integrity of the files that are copied, - backing up the raw data files on your MySQL replication slave - should take place while your slave server is shutdown. If the - MySQL server is still running then background tasks, - particularly with storage engines with background processes such - as InnoDB, may still be updating the database files. With - InnoDB, these problems should be resolved during crash recovery, - but since the slave server can be shutdown during the backup - process without affecting the execution of the master it makes - sense to take advantage of this facility. + To guarantee the integrity of the files that are copied, backing + up the raw data files on your MySQL replication slave should + take place while your slave server is shutdown. If the MySQL + server is still running then background tasks, particularly with + storage engines with background processes such as InnoDB, may + still be updating the database files. With InnoDB, these + problems should be resolved during crash recovery, but since the + slave server can be shutdown during the backup process without + affecting the execution of the master it makes sense to take + advantage of this facility. </para> <para> @@ -1017,8 +1017,8 @@ <para> Setting up replication using an SSL connection is similar to setting up a server and client using SSL. You will need to obtain - (or create) a suitable security certificate that you can use on the - master, and a similar certificate (from the same certificate + (or create) a suitable security certificate that you can use on + the master, and a similar certificate (from the same certificate authority) on each slave. </para> Modified: trunk/refman-5.1/replication.xml =================================================================== --- trunk/refman-5.1/replication.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/replication.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 734 bytes @@ -158,16 +158,16 @@ </para> <formalpara role="mnmas"> + <title>MySQL Enterprise</title> - - <para> The MySQL Network Monitoring and Advisory Service provides numerous advisors that provide immediate feedback about replication-related problems. For more information see, <ulink url="&base-url-enterprise;advisors.html"/>. </para> + </formalpara> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/> Modified: trunk/refman-5.1/restrictions.xml =================================================================== --- trunk/refman-5.1/restrictions.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/restrictions.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 767 bytes @@ -78,8 +78,8 @@ SQL prepared statements (<literal>PREPARE</literal>, <literal>EXECUTE</literal>, <literal>DEALLOCATE PREPARE</literal>). Implication: You cannot use dynamic SQL - within stored functions or triggers (where you construct dynamically - statements as strings and then execute them). + within stored functions or triggers (where you construct + dynamically statements as strings and then execute them). </para> </listitem> Modified: trunk/refman-5.1/se-falcon.xml =================================================================== --- trunk/refman-5.1/se-falcon.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/se-falcon.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 904 bytes @@ -344,9 +344,9 @@ Two further files contain the on-disk copy of the Falcon serial log. These are also created within the realm of the corresponding database. In a future release, you will be able to specify an - alternate location for these log files. So with the preceding example - data file <filename>test.fts</filename> the log files will be - named <filename>test.fl1</filename> and + alternate location for these log files. So with the preceding + example data file <filename>test.fts</filename> the log files will + be named <filename>test.fl1</filename> and <filename>test.fl2</filename>. </para> Modified: trunk/refman-5.1/se-federated.xml =================================================================== --- trunk/refman-5.1/se-federated.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/se-federated.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1021 bytes @@ -67,11 +67,10 @@ <para> A <emphasis>remote server</emphasis> with a database table, which in turn consists of the table definition (stored in the - <filename>.frm</filename> file) and the associated - table. The table type of the remote table may be any type - supported by the remote <literal>mysqld</literal> server, - including <literal>MyISAM</literal> or - <literal>InnoDB</literal>. + <filename>.frm</filename> file) and the associated table. The + table type of the remote table may be any type supported by + the remote <literal>mysqld</literal> server, including + <literal>MyISAM</literal> or <literal>InnoDB</literal>. </para> </listitem> Modified: trunk/refman-5.1/stored-procedures.xml =================================================================== --- trunk/refman-5.1/stored-procedures.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/stored-procedures.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 909 bytes @@ -40,18 +40,18 @@ answers to some common questions concerning stored routines and replication. </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - For expert advice on using stored procedures and functions subscribe to - the MySQL Network Monitoring and Advisory Service. For more - information see + For expert advice on using stored procedures and functions + subscribe to the MySQL Network Monitoring and Advisory Service. + For more information see <ulink url="&base-url-enterprise;advisors.html" />. </para> - + </formalpara> <para> Modified: trunk/refman-5.1/triggers.xml =================================================================== --- trunk/refman-5.1/triggers.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/triggers.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 1, Lines Added: 7, Lines Deleted: 8; 957 bytes @@ -92,18 +92,17 @@ the trigger. (This statement requires the <literal>SUPER</literal> privilege prior to MySQL 5.1.6.) </para> - + <formalpara role="mnmas"> - + <title>MySQL Enterprise</title> - + <para> - For expert advice on creating triggers subscribe to - the MySQL Network Monitoring and Advisory Service. For more - information see - <ulink url="&base-url-enterprise;advisors.html" />. + For expert advice on creating triggers subscribe to the MySQL + Network Monitoring and Advisory Service. For more information + see <ulink url="&base-url-enterprise;advisors.html" />. </para> - + </formalpara> <para> Modified: trunk/refman-5.1/tutorial.xml =================================================================== --- trunk/refman-5.1/tutorial.xml 2007-03-23 17:09:16 UTC (rev 5530) +++ trunk/refman-5.1/tutorial.xml 2007-03-23 17:41:36 UTC (rev 5531) Changed blocks: 3, Lines Added: 9, Lines Deleted: 13; 1582 bytes @@ -2890,7 +2890,7 @@ <primary>files</primary> <secondary>script</secondary> </indexterm> - + <indexterm> <primary>executing SQL statements from text files</primary> </indexterm> @@ -3046,23 +3046,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> @@ -3072,12 +3068,12 @@ by using the <literal>source</literal> command or <literal>\.</literal> command: </para> - + <programlisting> 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: r5531 - in trunk: . refman-5.0 refman-5.1 | paul | 23 Mar |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.188 sec. using MySQL 5.1.14-beta-log