Author: paul
Date: 2007-09-07 06:46:24 +0200 (Fri, 07 Sep 2007)
New Revision: 7745
Log:
r24667@frost: paul | 2007-09-06 23:35:40 -0500
Fix some more invalid remappings.
Modified:
trunk/refman-4.1/renamed-nodes.txt
trunk/refman-5.0/renamed-nodes.txt
trunk/refman-5.1/renamed-nodes.txt
trunk/refman-5.2/renamed-nodes.txt
trunk/tools/map-expired-nodes.pl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29982
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24665
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29982
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24667
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt 2007-09-07 02:16:33 UTC (rev 7744)
+++ trunk/refman-4.1/renamed-nodes.txt 2007-09-07 04:46:24 UTC (rev 7745)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 6; 2514 bytes
@@ -64,7 +64,7 @@
cj-jdbc-upgrading-issues connector-j-installing-upgrading
cj-replication-connection connector-j-reference-replication-connection
cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-retrieve-autoinc connector-j-usagenotes-basic
cj-supported-java-versions connector-j-versions-java
cj-supported-mysql-versions connector-j-versions
cj-system-requirements connector-j-versions
@@ -73,8 +73,8 @@
cj-type-conversions connector-j-reference-type-conversions
cj-understanding-transactions connector-j-usagenotes-j2ee
cj-upgrading connector-j-installing-upgrading
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading
+cj-using-callable-statements connector-j-usagenotes-basic
cj-using-ssl connector-j-reference-using-ssl
client-side-overview client-utility-overview
client-side-scripts client-utility-programs
@@ -105,7 +105,7 @@
environment-variables-options setting-environment-variables
error-messages error-handling
error-returns error-handling
-export-of-data myodbc-examples-tools-with-access-export
+export-of-data myodbc-examples-tools-with-access
extending-mysqltest mysql-test-suite
fetching-spatial-data-in-internal-format fetching-spatial-data
fetching-spatial-data-in-wkb-format fetching-spatial-data
@@ -183,7 +183,6 @@
myodbc-installation-binary myodbc-installation
myodbc-installation-obtaining myodbc-installation
myodbc-installation-source myodbc-installation
-myodbc-introduction myodbc-introduction
myodbc-mac-os-x myodbc-installation-source-unix
myodbc-mailing-list myodbc-support-community
myodbc-net myodbc-examples-programming
@@ -203,7 +202,7 @@
myodbc-unix-shared-libraries myodbc-installation-source-unix
myodbc-unix-source myodbc-installation-source-unix
myodbc-unix-tarball-installation myodbc-installation-binary-unix
-myodbc-unix-testing myodbc-installation-source-unix-testing
+myodbc-unix-testing myodbc-installation-source-unix
myodbc-unix-thread-safe myodbc-installation-source-unix
myodbc-windows-binary-installation myodbc-installation-binary-windows
myodbc-windows-source-installation myodbc-installation-source-windows
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2007-09-07 02:16:33 UTC (rev 7744)
+++ trunk/refman-5.0/renamed-nodes.txt 2007-09-07 04:46:24 UTC (rev 7745)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 6; 2450 bytes
@@ -69,7 +69,7 @@
cj-jdbc-upgrading-issues connector-j-installing-upgrading
cj-replication-connection connector-j-reference-replication-connection
cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-retrieve-autoinc connector-j-usagenotes-basic
cj-supported-java-versions connector-j-versions-java
cj-supported-mysql-versions connector-j-versions
cj-system-requirements connector-j-versions
@@ -78,8 +78,8 @@
cj-type-conversions connector-j-reference-type-conversions
cj-understanding-transactions connector-j-usagenotes-j2ee
cj-upgrading connector-j-installing-upgrading
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading
+cj-using-callable-statements connector-j-usagenotes-basic
cj-using-ssl connector-j-reference-using-ssl
cjk-faq faqs-cjk
cjk-faq-access-perl-php-troubles faqs-cjk
@@ -131,7 +131,7 @@
environment-variables-options setting-environment-variables
error-messages error-handling
error-returns error-handling
-export-of-data myodbc-examples-tools-with-access-export
+export-of-data myodbc-examples-tools-with-access
extending-mysqltest mysql-test-suite
faq-security faqs-security
faqs-stored-routines-triggers-replication faqs-stored-procs
@@ -284,7 +284,6 @@
myodbc-installation-binary myodbc-installation
myodbc-installation-obtaining myodbc-installation
myodbc-installation-source myodbc-installation
-myodbc-introduction myodbc-introduction
myodbc-mac-os-x myodbc-installation-source-unix
myodbc-mailing-list myodbc-support-community
myodbc-net myodbc-examples-programming
@@ -304,7 +303,7 @@
myodbc-unix-shared-libraries myodbc-installation-source-unix
myodbc-unix-source myodbc-installation-source-unix
myodbc-unix-tarball-installation myodbc-installation-binary-unix
-myodbc-unix-testing myodbc-installation-source-unix-testing
+myodbc-unix-testing myodbc-installation-source-unix
myodbc-unix-thread-safe myodbc-installation-source-unix
myodbc-windows-binary-installation myodbc-installation-binary-windows
myodbc-windows-source-installation myodbc-installation-source-windows
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2007-09-07 02:16:33 UTC (rev 7744)
+++ trunk/refman-5.1/renamed-nodes.txt 2007-09-07 04:46:24 UTC (rev 7745)
Changed blocks: 4, Lines Added: 5, Lines Deleted: 5; 2096 bytes
@@ -72,7 +72,7 @@
cj-jdbc-upgrading-issues connector-j-installing-upgrading
cj-replication-connection connector-j-reference-replication-connection
cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-retrieve-autoinc connector-j-usagenotes-basic
cj-supported-java-versions connector-j-versions-java
cj-supported-mysql-versions connector-j-versions
cj-system-requirements connector-j-versions
@@ -81,8 +81,8 @@
cj-type-conversions connector-j-reference-type-conversions
cj-understanding-transactions connector-j-usagenotes-j2ee
cj-upgrading connector-j-installing-upgrading
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
-cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading
+cj-using-callable-statements connector-j-usagenotes-basic
cj-using-ssl connector-j-reference-using-ssl
cjk-faq faqs-cjk
cjk-faq-access-perl-php-troubles faqs-cjk
@@ -141,7 +141,7 @@
events-information-schema events-table
events-show show-events
events-show-create show-create-event
-export-of-data myodbc-examples-tools-with-access-export
+export-of-data myodbc-examples-tools-with-access
extending-mysqltest mysql-test-suite
faq-security faqs-security
faqs-stored-routines-triggers-replication faqs-stored-procs
@@ -244,7 +244,7 @@
myodbc-unix-shared-libraries myodbc-installation-source-unix
myodbc-unix-source myodbc-installation-source-unix
myodbc-unix-tarball-installation myodbc-installation-binary-unix
-myodbc-unix-testing myodbc-installation-source-unix-testing
+myodbc-unix-testing myodbc-installation-source-unix
myodbc-unix-thread-safe myodbc-installation-source-unix
myodbc-windows-binary-installation myodbc-installation-binary-windows
myodbc-windows-source-installation myodbc-installation-source-windows
Modified: trunk/refman-5.2/renamed-nodes.txt
===================================================================
--- trunk/refman-5.2/renamed-nodes.txt 2007-09-07 02:16:33 UTC (rev 7744)
+++ trunk/refman-5.2/renamed-nodes.txt 2007-09-07 04:46:24 UTC (rev 7745)
Changed blocks: 4, Lines Added: 6, Lines Deleted: 7; 2304 bytes
@@ -63,7 +63,7 @@
cj-jdbc-upgrading-issues connector-j-installing-upgrading
cj-replication-connection connector-j-reference-replication-connection
cj-reporting-bugs connector-j-support-bug-report
-cj-retrieve-autoinc connector-j-usagenotes-last-insert-id
+cj-retrieve-autoinc connector-j-usagenotes-basic
cj-supported-java-versions connector-j-verions-java
cj-supported-mysql-versions connector-j-versions
cj-system-requirements connector-j-versions
@@ -72,9 +72,9 @@
cj-type-conversions connector-j-reference-type-conversions
cj-understanding-transactions connector-j-usagenotes-j2ee
cj-upgrading connector-j-installing-upgrading
-cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading-3-0-to-3-1
+cj-upgrading-3-0-to-3-1 connector-j-installing-upgrading
cj-usage-advisor connector-j-reference-usage-advisor
-cj-using-callable-statements connector-j-usagenotes-statements-callable
+cj-using-callable-statements connector-j-usagenotes-basic
cj-using-ssl connector-j-reference-using-ssl
cjk-faq faqs-cjk
cjk-faq-access-perl-php-troubles faqs-cjk
@@ -133,7 +133,7 @@
events-information-schema events-table
events-show show-events
events-show-create show-create-event
-export-of-data myodbc-examples-tools-with-access-export
+export-of-data myodbc-examples-tools-with-access
extending-mysqltest mysql-test-suite
faq-security faqs-security
faqs-stored-routines-triggers-replication faqs-stored-procs
@@ -236,9 +236,8 @@
myodbc-unix-shared-libraries myodbc-installation-source-unix
myodbc-unix-source myodbc-installation-source-unix
myodbc-unix-tarball-installation myodbc-installation-binary-unix
-myodbc-unix-testing myodbc-installation-source-unix-testing
-myodbc-unix-thread-safe
-myodbc-installation-source-unimyodbc-installation-source-unix
+myodbc-unix-testing myodbc-installation-source-unix
+myodbc-unix-thread-safe myodbc-installation-source-unix
myodbc-windows-binary-installation myodbc-installation-binary-windows
myodbc-windows-source-installation myodbc-installation-source-windows
myodbc-windows-source-requirements myodbc-installation-source-windows
Modified: trunk/tools/map-expired-nodes.pl
===================================================================
--- trunk/tools/map-expired-nodes.pl 2007-09-07 02:16:33 UTC (rev 7744)
+++ trunk/tools/map-expired-nodes.pl 2007-09-07 04:46:24 UTC (rev 7745)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 510 bytes
@@ -164,8 +164,7 @@
if (@f < 2 || @f > 3)
{
- warn "ERROR: Malformed renamed-nodes.txt line:\n$_\n"
- . "(expecting 2 or 3 fields)\n";
+ warn "ERROR: Malformed renamed-nodes.txt line (expecting 2 or 3 fields): $_\n";
++$errors;
next;
}
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7745 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 tools | paul | 7 Sep |
