Author: paul
Date: 2006-06-13 18:31:15 +0200 (Tue, 13 Jun 2006)
New Revision: 2365
Log:
r10492@polar: paul | 2006-06-13 11:30:49 -0500
Exclude MyODBC section from Texinfo builds (nesting is too deep
for Texinfo to handle).
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/exclusions-texi.xml
trunk/refman-4.1/installing.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/exclusions-texi.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/exclusions-texi.xml
trunk/refman-5.1/installing.xml
trunk/refman-common/bug-reports.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10468
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11231
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10492
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11231
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-4.1/apis.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -5947,8 +5947,8 @@
<literal>NULL</literal> or the empty string
<literal>""</literal>, the current user is assumed. Under
Unix, this is the current login name. Under Windows ODBC,
- the current username must be specified explicitly. See
- <xref linkend="myodbc-configuration-dsn-windows"/>.
+ the current username must be specified explicitly. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-4.1/database-administration.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -24175,8 +24175,8 @@
<para>
The last form is not cached because it is used as the ODBC
- workaround for obtaining the last insert ID value. See
- <xref linkend="myodbc-usagenotes-functionality-last-insert-id"/>.
+ workaround for obtaining the last insert ID value. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/exclusions-texi.xml
===================================================================
--- trunk/refman-4.1/exclusions-texi.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-4.1/exclusions-texi.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -7,4 +7,6 @@
<id>java-connector</id>
+ <id>myodbc-connector</id>
+
</idlist>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-4.1/installing.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -2695,7 +2695,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you need
- a Connector/ODBC driver. See <xref linkend="myodbc-connector"/>.
+ a Connector/ODBC driver. See <xref linkend="connectors"/>.
</para>
</listitem>
@@ -6704,7 +6704,7 @@
<command>myisamchk</command> makes use of external locking.
External locking is known to have problems on NetWare 6.0; the
problem has been eliminated in NetWare 6.5. Note that the use
- of MySQL on Netware 6.0 is not officially supported.
+ of MySQL on Netware 6.0 is not officially supported.
</para>
<para>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.0/apis.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -6004,8 +6004,8 @@
<literal>NULL</literal> or the empty string
<literal>""</literal>, the current user is assumed. Under
Unix, this is the current login name. Under Windows ODBC,
- the current username must be specified explicitly. See
- <xref linkend="myodbc-configuration-dsn-windows"/>.
+ the current username must be specified explicitly. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.0/database-administration.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -26780,8 +26780,8 @@
<para>
The last form is not cached because it is used as the ODBC
- workaround for obtaining the last insert ID value. See
- <xref linkend="myodbc-usagenotes-functionality-last-insert-id"/>.
+ workaround for obtaining the last insert ID value. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/exclusions-texi.xml
===================================================================
--- trunk/refman-5.0/exclusions-texi.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.0/exclusions-texi.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -7,4 +7,6 @@
<id>java-connector</id>
+ <id>myodbc-connector</id>
+
</idlist>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.0/installing.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -2683,7 +2683,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you need
- a Connector/ODBC driver. See <xref linkend="myodbc-connector"/>.
+ a Connector/ODBC driver. See <xref linkend="connectors"/>.
</para>
</listitem>
@@ -6583,7 +6583,7 @@
<command>myisamchk</command> makes use of external locking.
External locking is known to have problems on NetWare 6.0; the
problem has been eliminated in NetWare 6.5. Note that the use
- of MySQL on Netware 6.0 is not officially supported.
+ of MySQL on Netware 6.0 is not officially supported.
</para>
<para>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.1/apis.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -5990,8 +5990,8 @@
<literal>NULL</literal> or the empty string
<literal>""</literal>, the current user is assumed. Under
Unix, this is the current login name. Under Windows ODBC,
- the current username must be specified explicitly. See
- <xref linkend="myodbc-configuration-dsn-windows"/>.
+ the current username must be specified explicitly. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.1/database-administration.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -27037,8 +27037,8 @@
<para>
The last form is not cached because it is used as the ODBC
- workaround for obtaining the last insert ID value. See
- <xref linkend="myodbc-usagenotes-functionality-last-insert-id"/>.
+ workaround for obtaining the last insert ID value. See the
+ MyODBC section of <xref linkend="connectors"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/exclusions-texi.xml
===================================================================
--- trunk/refman-5.1/exclusions-texi.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.1/exclusions-texi.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -7,4 +7,6 @@
<id>java-connector</id>
+ <id>myodbc-connector</id>
+
</idlist>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-5.1/installing.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -2679,7 +2679,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you need
- a Connector/ODBC driver. See <xref linkend="myodbc-connector"/>.
+ a Connector/ODBC driver. See <xref linkend="connectors"/>.
</para>
</listitem>
@@ -6547,7 +6547,7 @@
<command>myisamchk</command> makes use of external locking.
External locking is known to have problems on NetWare 6.0; the
problem has been eliminated in NetWare 6.5. Note that the use
- of MySQL on Netware 6.0 is not officially supported.
+ of MySQL on Netware 6.0 is not officially supported.
</para>
<para>
@@ -8167,11 +8167,10 @@
For any plugin that is not explicitly selected or disabled,
it is selected to be built dynamically if it supports
dynamic build, and not built if it does not support dynamic
- build.
- (Thus, in the case that no plugin options are given, all
- plugins that support dynamic build are selected to be built
- as dynamic plugins. Plugins that do not support dynamic
- build are not built.)
+ build. (Thus, in the case that no plugin options are given,
+ all plugins that support dynamic build are selected to be
+ built as dynamic plugins. Plugins that do not support
+ dynamic build are not built.)
</para>
</listitem>
Modified: trunk/refman-common/bug-reports.xml
===================================================================
--- trunk/refman-common/bug-reports.xml 2006-06-13 15:49:14 UTC (rev 2364)
+++ trunk/refman-common/bug-reports.xml 2006-06-13 16:31:15 UTC (rev 2365)
@@ -251,8 +251,8 @@
<para>
If you have a problem with Connector/ODBC (MyODBC), please try to
- generate a trace file and send it with your report. See
- <xref linkend="myodbc-support-bug-report"/>.
+ generate a trace file and send it with your report. See the MyODBC
+ section of <xref linkend="connectors"/>.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2365 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 13 Jun |
