Author: paul
Date: 2009-05-31 04:31:59 +0200 (Sun, 31 May 2009)
New Revision: 15146
Log:
r38721@arctic: paul | 2009-05-30 21:23:57 -0500
Update dependencies
Modified:
trunk/refman-5.0/Makefile.depends
trunk/refman-6.0/Makefile.depends
trunk/topic-guides/topics-5.0/Makefile.depends
trunk/topic-guides/topics-6.0/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41711
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38710
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41711
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38721
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2009-05-31 01:47:04 UTC (rev 15145)
+++ trunk/refman-5.0/Makefile.depends 2009-05-31 02:31:59 UTC (rev 15146)
Changed blocks: 7, Lines Added: 17, Lines Deleted: 4; 3379 bytes
@@ -1653,9 +1653,9 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/urls.ent \
all-entities.ent \
+ replication-options-core.xml \
versions.ent
dynxml_local_replication_options_IMAGES =
dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)
@@ -2410,7 +2410,6 @@
../mysql-monitor-2.0/news-monitor-core.xml \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../common/fixedchars.ent \
../common/phrases.ent \
../dynamic-docs/faq/memcached.xml \
@@ -2712,6 +2711,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
replication.xml \
restrictions.xml \
@@ -4481,10 +4481,10 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/urls.ent \
all-entities.ent \
dynxml-local-replication-options.xml \
+ replication-options-core.xml \
versions.ent
replication_configuration_IMAGES =
replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
@@ -4574,6 +4574,19 @@
replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
replication_solutions_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -4618,7 +4631,6 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/images/published/multi-db.png \
../refman-common/images/published/redundancy-after.png \
../refman-common/images/published/redundancy-before.png \
@@ -4630,6 +4642,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
versions.ent
replication_IMAGES = \
Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends 2009-05-31 01:47:04 UTC (rev 15145)
+++ trunk/refman-6.0/Makefile.depends 2009-05-31 02:31:59 UTC (rev 15146)
Changed blocks: 7, Lines Added: 17, Lines Deleted: 4; 3371 bytes
@@ -1652,9 +1652,9 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/urls.ent \
all-entities.ent \
+ replication-options-core.xml \
versions.ent
dynxml_local_replication_options_IMAGES =
dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)
@@ -2467,7 +2467,6 @@
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
images/published/dtrace-groups.png \
- replication-options-core.xml \
../common/fixedchars.ent \
../common/phrases.ent \
../dynamic-docs/faq/memcached.xml \
@@ -2781,6 +2780,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
replication.xml \
restrictions.xml \
@@ -4070,10 +4070,10 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/urls.ent \
all-entities.ent \
dynxml-local-replication-options.xml \
+ replication-options-core.xml \
versions.ent
replication_configuration_IMAGES =
replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
@@ -4175,6 +4175,19 @@
replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
replication_solutions_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -4244,7 +4257,6 @@
../mysql-monitor-2.0/enterprise.ent \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- replication-options-core.xml \
../refman-common/images/published/multi-db.png \
../refman-common/images/published/redundancy-after.png \
../refman-common/images/published/redundancy-before.png \
@@ -4268,6 +4280,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
versions.ent
replication_IMAGES = \
Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends 2009-05-31 01:47:04 UTC (rev 15145)
+++ trunk/topic-guides/topics-5.0/Makefile.depends 2009-05-31 02:31:59 UTC (rev 15146)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 5845 bytes
@@ -442,7 +442,6 @@
../../mysql-monitor-2.0/enterprise.ent \
../../mysql-monitor-2.0/urls.ent \
../../mysql-monitor-2.0/version.ent \
- ../../refman-5.0/replication-options-core.xml \
../../refman-common/images/published/multi-db.png \
../../refman-common/images/published/redundancy-after.png \
../../refman-common/images/published/redundancy-before.png \
@@ -454,6 +453,7 @@
../../refman-5.0/replication-configuration.xml \
../../refman-5.0/replication-implementation.xml \
../../refman-5.0/replication-notes.xml \
+ ../../refman-5.0/replication-options-core.xml \
../../refman-5.0/replication-solutions.xml \
../../refman-5.0/replication.xml \
../../refman-5.0/versions.ent \
@@ -514,7 +514,6 @@
../../mysql-monitor-2.0/enterprise.ent \
../../mysql-monitor-2.0/urls.ent \
../../mysql-monitor-2.0/version.ent \
- ../../refman-5.0/replication-options-core.xml \
../../refman-common/images/published/multi-db.png \
../../refman-common/images/published/redundancy-after.png \
../../refman-common/images/published/redundancy-before.png \
@@ -527,6 +526,7 @@
../../refman-5.0/replication-configuration.xml \
../../refman-5.0/replication-implementation.xml \
../../refman-5.0/replication-notes.xml \
+ ../../refman-5.0/replication-options-core.xml \
../../refman-5.0/replication-solutions.xml \
../../refman-5.0/replication.xml \
../../refman-5.0/versions.ent \
@@ -1127,7 +1127,7 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.0/metadata/replication-implementation.idmap ../../refman-5.0/../refman-common/images/published/submaster-performance.png ../../refman-5.0/../mysql-monitor-2.0/urls.ent ../../refman-5.0/../refman-common/images/published/redundancy-after.png ../../refman-5.0/versions.ent ../../refman-5.0/../common/phrases.ent ../../refman-5.0/../dynamic-docs/metadata-titles.en.xml ../../refman-5.0/replication-solutions.xml ../../refman-5.0/../refman-common/images/published/redundancy-before.png all-entities.ent ../../refman-5.0/../refman-common/images/published/multi-db.png ../../common/phrases.ent ../../refman-5.0!
/../refman-common/images/published/scaleout.png ../../refman-5.0/replication-notes.xml mysql-replication-excerpt-aspec.xml ../../refman-5.0/../refman-5.0/replication-options-core.xml ../../refman-5.0/../refman-common/urls.ent ../../refman-5.0/metadata/replication-solutions.idmap ../../refman-common/urls.ent ../../refman-5.0/replication.xml ../../refman-5.0/../mysql-monitor-2.0/enterprise.ent ../../refman-5.0/metadata/replication-configuration.idmap ../../refman-5.0/all-entities.ent ../../refman-5.0/metadata/replication.idmap ../../refman-5.0/replication-configuration.xml ../../common/fixedchars.ent ../../refman-5.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/dynxml-local-replication-options.xml ../../refman-5.0/../common/fixedchars.ent mysql-replication-excerpt-base.xml ../../refman-5.0/../mysql-monitor-2.0/version.ent ../../refman-5.0/replication-implementation.xml ../../refman-5.0/metadata/replication-notes.idmap
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.0/metadata/replication-implementation.idmap ../../refman-5.0/../refman-common/images/published/submaster-performance.png ../../refman-5.0/../mysql-monitor-2.0/urls.ent ../../refman-5.0/../refman-common/images/published/redundancy-after.png ../../refman-5.0/metadata/replication-options-core.idmap ../../refman-5.0/versions.ent ../../refman-5.0/../common/phrases.ent ../../refman-5.0/../dynamic-docs/metadata-titles.en.xml ../../refman-5.0/replication-solutions.xml ../../refman-5.0/../refman-common/images/published/redundancy-before.png all-entities.ent ../../refman-5.0/../refman-common/images/publish!
ed/multi-db.png ../../common/phrases.ent ../../refman-5.0/../refman-common/images/published/scaleout.png ../../refman-5.0/replication-notes.xml mysql-replication-excerpt-aspec.xml ../../refman-5.0/../refman-common/urls.ent ../../refman-5.0/metadata/replication-solutions.idmap ../../refman-common/urls.ent ../../refman-5.0/replication.xml ../../refman-5.0/../mysql-monitor-2.0/enterprise.ent ../../refman-5.0/metadata/replication-configuration.idmap ../../refman-5.0/replication-options-core.xml ../../refman-5.0/all-entities.ent ../../refman-5.0/metadata/replication.idmap ../../refman-5.0/replication-configuration.xml ../../common/fixedchars.ent ../../refman-5.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/dynxml-local-replication-options.xml ../../refman-5.0/../common/fixedchars.ent mysql-replication-excerpt-base.xml ../../refman-5.0/metadata/replication-notes.idmap ../../refman-5.0/../mysql-monitor-2.0/version.ent ../../refman-5.0/replication-implementation.xml
$(MAKE) mysql-replication-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends 2009-05-31 01:47:04 UTC (rev 15145)
+++ trunk/topic-guides/topics-6.0/Makefile.depends 2009-05-31 02:31:59 UTC (rev 15146)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 7841 bytes
@@ -569,7 +569,6 @@
../../mysql-monitor-2.0/enterprise.ent \
../../mysql-monitor-2.0/urls.ent \
../../mysql-monitor-2.0/version.ent \
- ../../refman-6.0/replication-options-core.xml \
../../refman-common/images/published/multi-db.png \
../../refman-common/images/published/redundancy-after.png \
../../refman-common/images/published/redundancy-before.png \
@@ -593,6 +592,7 @@
../../refman-6.0/replication-configuration.xml \
../../refman-6.0/replication-implementation.xml \
../../refman-6.0/replication-notes.xml \
+ ../../refman-6.0/replication-options-core.xml \
../../refman-6.0/replication-solutions.xml \
../../refman-6.0/replication.xml \
../../refman-6.0/versions.ent \
@@ -667,7 +667,6 @@
../../mysql-monitor-2.0/enterprise.ent \
../../mysql-monitor-2.0/urls.ent \
../../mysql-monitor-2.0/version.ent \
- ../../refman-6.0/replication-options-core.xml \
../../refman-common/images/published/multi-db.png \
../../refman-common/images/published/redundancy-after.png \
../../refman-common/images/published/redundancy-before.png \
@@ -691,6 +690,7 @@
../../refman-6.0/replication-configuration.xml \
../../refman-6.0/replication-implementation.xml \
../../refman-6.0/replication-notes.xml \
+ ../../refman-6.0/replication-options-core.xml \
../../refman-6.0/replication-solutions.xml \
../../refman-6.0/replication.xml \
../../refman-6.0/versions.ent \
@@ -1287,7 +1287,7 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-6.0/../common/phrases.ent ../../refman-6.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/metadata/replication-implementation.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/redundancy-before.png ../../refman-6.0/dynxml-local-replication-options.xml ../../refman-6.0/versions.ent ../../refman-6.0/all-entities.ent ../../refman-6.0/../dynamic-docs/metadata-titles.en.xml ../../refman-6.0/metadata/replication-configuration.idmap!
../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png ../../refman-6.0/../refman-common/urls.ent ../../refman-6.0/../refman-common/images/published/multi-db.png ../../refman-6.0/../refman-6.0/replication-options-core.xml ../../refman-6.0/replication-implementation.xml all-entities.ent ../../refman-6.0/../gui-common/gui-common.ent ../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml ../../common/phrases.ent ../../refman-6.0/metadata/replication-notes.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png mysql-replication-excerpt-aspec.xml ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-common/urls.ent ../../refman-6.0/../mysql-monitor-2.0/enterprise.ent ../../refman-6.0/../mysql-monitor-2.0/version.ent ../../refman-6.0/replication.xml ../../common/fixedchars.ent .!
./../refman-6.0/../mysql-monitor-2.0/urls.ent ../../refman-6.0!
/../refm
an-common/images/published/rpl-circular-upgrade-8.png ../../refman-6.0/../refman-common/images/published/redundancy-after.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/../common/fixedchars.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/metadata/replication-solutions.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/metadata/replication.idmap mysql-replication-excerpt-base.xml ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-6.0/../common/phrases.ent ../../refman-6.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/metadata/replication-implementation.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/redundancy-before.png ../../refman-6.0/dynxml-local-replication-options.xml ../../refman-6.0/replication-options-core.xml ../../refman-6.0/versions.ent ../../refman-6.0/all-entities.ent ../../refman-6.0/../dynamic-docs/metadata-titles.en.xml ../../refma!
n-6.0/metadata/replication-configuration.idmap ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png ../../refman-6.0/../refman-common/urls.ent ../../refman-6.0/../refman-common/images/published/multi-db.png ../../refman-6.0/metadata/replication-options-core.idmap ../../refman-6.0/replication-implementation.xml all-entities.ent ../../refman-6.0/../gui-common/gui-common.ent ../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml ../../common/phrases.ent ../../refman-6.0/metadata/replication-notes.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png mysql-replication-excerpt-aspec.xml ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-common/urls.ent ../../refman-6.0/../mysql-monitor-2.0/enterprise.ent ../../refman-6.0/../mysql-monitor-2.0/version.ent ../../refman-6.0/re!
plication.xml ../../common/fixedchars.ent ../../refman-6.0/../!
mysql-mo
nitor-2.0/urls.ent ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png ../../refman-6.0/../refman-common/images/published/redundancy-after.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/../common/fixedchars.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/metadata/replication-solutions.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/metadata/replication.idmap mysql-replication-excerpt-base.xml ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
$(MAKE) mysql-replication-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r15146 - in trunk: . refman-5.0 refman-6.0 topic-guides/topics-5.0 topic-guides/topics-6.0 | paul.dubois | 31 May |
