Author: paul
Date: 2006-07-17 06:40:58 +0200 (Mon, 17 Jul 2006)
New Revision: 2745
Log:
r11452@polar: paul | 2006-07-16 23:38:42 -0500
Update dependencies.
Modified:
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11450
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12262
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11452
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12262
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-17 04:04:40 UTC (rev 2744)
+++ trunk/refman-4.1/Makefile 2006-07-17 04:40:58 UTC (rev 2745)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 5756 bytes
@@ -29,7 +29,7 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-in!
stall-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myacce!
ss.png images/myaccess-odbc.png connector-net.xml ../refman-co!
mmon/new
s-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
@@ -41,28 +41,28 @@
depend:: connector-j.depend
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-17 04:04:40 UTC (rev 2744)
+++ trunk/refman-5.0/Makefile 2006-07-17 04:40:58 UTC (rev 2745)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 5743 bytes
@@ -29,7 +29,7 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml!
connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-st!
ep3.png images/myodbc-excel-step4.png images/myodbc-excel-step!
5.png im
ages/myaccess.png images/myaccess-odbc.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
@@ -41,28 +41,28 @@
depend:: connector-j.depend
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-17 04:04:40 UTC (rev 2744)
+++ trunk/refman-5.1/Makefile 2006-07-17 04:40:58 UTC (rev 2745)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 5936 bytes
@@ -29,7 +29,7 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images!
/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.!
png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc!
-win-tra
cing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
@@ -41,28 +41,28 @@
depend:: connector-j.depend
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2745 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 17 Jul |
