Author: tbedford
Date: 2009-05-29 16:08:14 +0200 (Fri, 29 May 2009)
New Revision: 15120
Log:
Added some further install instructions. Updated 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
trunk/workbench/Makefile.depends
trunk/workbench/installing.xml
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2009-05-29 13:02:22 UTC (rev 15119)
+++ trunk/refman-5.0/Makefile.depends 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 13, Lines Added: 21, Lines Deleted: 6; 5908 bytes
@@ -1606,7 +1606,6 @@
../refman-5.0/metadata/mysql-cluster-programs-core.idmap \
../refman-5.0/metadata/restrictions.idmap \
../refman-5.0/metadata/se-innodb-core.idmap \
- ../refman-5.0/metadata/spatial-extensions.idmap \
../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
../refman-5.0/metadata/sql-syntax-server-administration.idmap
@@ -1627,9 +1626,9 @@
../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/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)
@@ -1642,6 +1641,7 @@
../refman-5.0/metadata/replication-configuration.idmap \
../refman-5.0/metadata/replication-implementation.idmap \
../refman-5.0/metadata/replication-notes.idmap \
+ ../refman-5.0/metadata/replication-options-core.idmap \
../refman-5.0/metadata/sql-syntax-replication.idmap \
../refman-5.0/metadata/stored-programs-views.idmap \
../refman-5.1/metadata/errors-problems-core.idmap
@@ -2379,7 +2379,6 @@
../mysql-monitor-2.0/news-monitor-core.xml \
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
- ../refman-5.0/replication-options-core.xml \
../refman-common/../common/fixedchars.ent \
../refman-common/../common/phrases.ent \
../refman-common/../dynamic-docs/faq/memcached.xml \
@@ -2681,6 +2680,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
replication.xml \
restrictions.xml \
@@ -2970,6 +2970,7 @@
../refman-5.0/metadata/replication-configuration.idmap \
../refman-5.0/metadata/replication-implementation.idmap \
../refman-5.0/metadata/replication-notes.idmap \
+ ../refman-5.0/metadata/replication-options-core.idmap \
../refman-5.0/metadata/replication-solutions.idmap \
../refman-5.0/metadata/replication.idmap \
../refman-5.0/metadata/restrictions.idmap \
@@ -4380,7 +4381,6 @@
../refman-5.0/metadata/mysql-cluster-programs-core.idmap \
../refman-5.0/metadata/restrictions.idmap \
../refman-5.0/metadata/se-innodb-core.idmap \
- ../refman-5.0/metadata/spatial-extensions.idmap \
../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
../refman-5.0/metadata/sql-syntax-server-administration.idmap
@@ -4401,10 +4401,10 @@
../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/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)
@@ -4418,6 +4418,7 @@
../refman-5.0/metadata/replication-configuration.idmap \
../refman-5.0/metadata/replication-implementation.idmap \
../refman-5.0/metadata/replication-notes.idmap \
+ ../refman-5.0/metadata/replication-options-core.idmap \
../refman-5.0/metadata/sql-syntax-replication.idmap \
../refman-5.0/metadata/sql-syntax-server-administration.idmap \
../refman-5.0/metadata/stored-programs-views.idmap \
@@ -4493,6 +4494,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 \
@@ -4537,7 +4551,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 \
@@ -4549,6 +4562,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
versions.ent
replication_IMAGES = \
@@ -4571,6 +4585,7 @@
../refman-5.0/metadata/replication-configuration.idmap \
../refman-5.0/metadata/replication-implementation.idmap \
../refman-5.0/metadata/replication-notes.idmap \
+ ../refman-5.0/metadata/replication-options-core.idmap \
../refman-5.0/metadata/replication-solutions.idmap \
../refman-5.0/metadata/se-innodb-core.idmap \
../refman-5.0/metadata/se-memory.idmap \
Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends 2009-05-29 13:02:22 UTC (rev 15119)
+++ trunk/refman-6.0/Makefile.depends 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 12, Lines Added: 21, Lines Deleted: 5; 5498 bytes
@@ -1425,7 +1425,6 @@
../refman-6.0/metadata/se-falcon-core.idmap \
../refman-6.0/metadata/se-innodb-core.idmap \
../refman-6.0/metadata/se-maria-core.idmap \
- ../refman-6.0/metadata/spatial-extensions.idmap \
../refman-6.0/metadata/sql-syntax-compound-statements.idmap \
../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
../refman-6.0/metadata/sql-syntax-replication.idmap \
@@ -1624,9 +1623,9 @@
../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/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)
@@ -1639,6 +1638,7 @@
../refman-6.0/metadata/replication-configuration.idmap \
../refman-6.0/metadata/replication-implementation.idmap \
../refman-6.0/metadata/replication-notes.idmap \
+ ../refman-6.0/metadata/replication-options-core.idmap \
../refman-6.0/metadata/sql-syntax-replication.idmap \
../refman-6.0/metadata/sql-syntax-server-administration.idmap \
../refman-6.0/metadata/stored-programs-views.idmap
@@ -2434,7 +2434,6 @@
../mysql-monitor-2.0/urls.ent \
../mysql-monitor-2.0/version.ent \
../refman-6.0/images/published/dtrace-groups.png \
- ../refman-6.0/replication-options-core.xml \
../refman-common/../common/fixedchars.ent \
../refman-common/../common/phrases.ent \
../refman-common/../dynamic-docs/faq/memcached.xml \
@@ -2748,6 +2747,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
replication.xml \
restrictions.xml \
@@ -3049,6 +3049,7 @@
../refman-6.0/metadata/replication-configuration.idmap \
../refman-6.0/metadata/replication-implementation.idmap \
../refman-6.0/metadata/replication-notes.idmap \
+ ../refman-6.0/metadata/replication-options-core.idmap \
../refman-6.0/metadata/replication-solutions.idmap \
../refman-6.0/metadata/replication.idmap \
../refman-6.0/metadata/restrictions.idmap \
@@ -3988,10 +3989,10 @@
../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/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)
@@ -4008,6 +4009,7 @@
../refman-6.0/metadata/replication-configuration.idmap \
../refman-6.0/metadata/replication-implementation.idmap \
../refman-6.0/metadata/replication-notes.idmap \
+ ../refman-6.0/metadata/replication-options-core.idmap \
../refman-6.0/metadata/sql-syntax-replication.idmap \
../refman-6.0/metadata/sql-syntax-server-administration.idmap \
../refman-6.0/metadata/stored-programs-views.idmap
@@ -4092,6 +4094,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 \
@@ -4161,7 +4176,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 \
@@ -4185,6 +4199,7 @@
replication-configuration.xml \
replication-implementation.xml \
replication-notes.xml \
+ replication-options-core.xml \
replication-solutions.xml \
versions.ent
replication_IMAGES = \
@@ -4224,6 +4239,7 @@
../refman-6.0/metadata/replication-configuration.idmap \
../refman-6.0/metadata/replication-implementation.idmap \
../refman-6.0/metadata/replication-notes.idmap \
+ ../refman-6.0/metadata/replication-options-core.idmap \
../refman-6.0/metadata/replication-solutions.idmap \
../refman-6.0/metadata/se-innodb-core.idmap \
../refman-6.0/metadata/se-memory-core.idmap \
Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends 2009-05-29 13:02:22 UTC (rev 15119)
+++ trunk/topic-guides/topics-5.0/Makefile.depends 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 6041 bytes
@@ -442,7 +442,6 @@
../../refman-5.0/../mysql-monitor-2.0/enterprise.ent \
../../refman-5.0/../mysql-monitor-2.0/urls.ent \
../../refman-5.0/../mysql-monitor-2.0/version.ent \
- ../../refman-5.0/../refman-5.0/replication-options-core.xml \
../../refman-5.0/../refman-common/images/published/multi-db.png \
../../refman-5.0/../refman-common/images/published/redundancy-after.png \
../../refman-5.0/../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 @@
../../refman-5.0/../mysql-monitor-2.0/enterprise.ent \
../../refman-5.0/../mysql-monitor-2.0/urls.ent \
../../refman-5.0/../mysql-monitor-2.0/version.ent \
- ../../refman-5.0/../refman-5.0/replication-options-core.xml \
../../refman-5.0/../refman-common/images/published/multi-db.png \
../../refman-5.0/../refman-common/images/published/redundancy-after.png \
../../refman-5.0/../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-29 13:02:22 UTC (rev 15119)
+++ trunk/topic-guides/topics-6.0/Makefile.depends 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 8037 bytes
@@ -569,7 +569,6 @@
../../refman-6.0/../mysql-monitor-2.0/enterprise.ent \
../../refman-6.0/../mysql-monitor-2.0/urls.ent \
../../refman-6.0/../mysql-monitor-2.0/version.ent \
- ../../refman-6.0/../refman-6.0/replication-options-core.xml \
../../refman-6.0/../refman-common/images/published/multi-db.png \
../../refman-6.0/../refman-common/images/published/redundancy-after.png \
../../refman-6.0/../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 @@
../../refman-6.0/../mysql-monitor-2.0/enterprise.ent \
../../refman-6.0/../mysql-monitor-2.0/urls.ent \
../../refman-6.0/../mysql-monitor-2.0/version.ent \
- ../../refman-6.0/../refman-6.0/replication-options-core.xml \
../../refman-6.0/../refman-common/images/published/multi-db.png \
../../refman-6.0/../refman-common/images/published/redundancy-after.png \
../../refman-6.0/../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
Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends 2009-05-29 13:02:22 UTC (rev 15119)
+++ trunk/workbench/Makefile.depends 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 3; 2132 bytes
@@ -50,7 +50,7 @@
dynxml_local_news_workbench_IMAGES =
dynxml_local_news_workbench_SOURCES = dynxml-local-news-workbench.xml $(dynxml_local_news_workbench_INCLUDES)
dynxml_local_news_workbench_IDMAPS = \
- ../workbench/metadata/launching.idmap
+ ../workbench/metadata/initial-startup.idmap
dynxml-local-news-workbench.validpure: $(dynxml_local_news_workbench_SOURCES)
dynxml-local-news-workbench.titles: $(dynxml_local_news_workbench_SOURCES)
dynxml-local-news-workbench.useless: $(dynxml_local_news_workbench_SOURCES)
@@ -187,10 +187,12 @@
installing_INCLUDES = \
../common/fixedchars.ent \
../refman-common/urls.ent \
+ ../workbench/images/published/wb-installing-mac-install-screen.png \
all-entities.ent \
version.ent \
workbench.ent
-installing_IMAGES =
+installing_IMAGES = \
+ ../workbench/images/published/wb-installing-mac-install-screen.png
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS =
installing.validpure: $(installing_SOURCES)
@@ -576,6 +578,7 @@
../dynamic-docs/changelog/workbench-versions.xml \
../dynamic-docs/changelog/workbench.xml \
../refman-common/urls.ent \
+ ../workbench/images/published/wb-installing-mac-install-screen.png \
all-entities.ent \
dbdoc-templates.xml \
documenting-database.xml \
@@ -636,6 +639,7 @@
views.xml \
workbench.ent
workbench_IMAGES = \
+ ../workbench/images/published/wb-installing-mac-install-screen.png \
images/published/wb-add-eer-diagram.png \
images/published/wb-application-layout.png \
images/published/wb-connection-wizard1.png \
@@ -679,7 +683,7 @@
../workbench/metadata/forward-engineering.idmap \
../workbench/metadata/grt-shell.idmap \
../workbench/metadata/images.idmap \
- ../workbench/metadata/launching.idmap \
+ ../workbench/metadata/initial-startup.idmap \
../workbench/metadata/layers.idmap \
../workbench/metadata/notes.idmap \
../workbench/metadata/plugins.idmap \
Modified: trunk/workbench/installing.xml
===================================================================
--- trunk/workbench/installing.xml 2009-05-29 13:02:22 UTC (rev 15119)
+++ trunk/workbench/installing.xml 2009-05-29 14:08:14 UTC (rev 15120)
Changed blocks: 3, Lines Added: 200, Lines Deleted: 1; 6237 bytes
@@ -36,6 +36,12 @@
</itemizedlist>
<para>
+ Binary distributions of &workbench; are avaliable for the above
+ platforms. Source code distributions are also available as a
+ <filename>tar.gz</filename> package, or an RPM package.
+ </para>
+
+ <para>
The following sections explain the installation process for each of
these platforms.
</para>
@@ -226,7 +232,7 @@
<section id="wb-installing-windows-uninstalling">
- <title>Uninstalling &workbench; – Windows</title>
+ <title>Uninstalling &workbench; on Windows</title>
<para>
The method for uninstalling &workbench; will depend on how you
@@ -296,4 +302,197 @@
</section>
+ <section id="wb-installing-linux">
+
+ <title>Installing &workbench; on Linux</title>
+
+ <para>
+ There are several binary distributions of &workbench; available
+ for Linux. These include:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ Fedora 10 amd64 (RPM)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Ubuntu 8.04 i386 (DEB)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Ubuntu 8.10 amd64 (DEB)
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ In addition to the binary distributions, it is also possible to
+ download the &workbench; source code as a
+ <filename>tar.gz</filename> or RPM package.
+ </para>
+
+ <para>
+ Check the &workbench;
+ <ulink url="http://dev.mysql.com/downloads/workbench/5.1.html">download
+ page</ulink> for the latest packages.
+ </para>
+
+ <para>
+ The procedure for installing on Linux depends on which Linux
+ distribution you are using.
+ </para>
+
+ <para>
+ <emphasis role="bold">Installing DEB packages</emphasis>
+ </para>
+
+ <para>
+ On Ubuntu, and other systems that use the Debian package scheme,
+ you can install &workbench; using a command such as:
+ </para>
+
+<programlisting>shell> sudo dpkg -i <replaceable>package</replaceable>.deb</programlisting>
+
+ <para>
+ Note that
+ <filename><replaceable>package</replaceable>.deb</filename> will
+ be the &workbench; package, for example,
+ <filename>mysql-workbench-oss-<replaceable>version</replaceable>_i386.deb</filename>,
+ where <replaceable>version</replaceable> is the &workbench;
+ version number.
+ </para>
+
+ <para>
+ Once &workbench; has been installed it can be launched on Ubuntu
+ by selecting <guimenu>Applications</guimenu>,
+ <guimenu>Programming</guimenu>, <guimenu>MySQL Workbench</guimenu>
+ from the main menu.
+ </para>
+
+ <para>
+ <emphasis role="bold">Installing RPM packages</emphasis>
+ </para>
+
+ <para>
+ On RedHat-based systems, and other systems using the RPM package
+ format, &workbench; can be installed by a command such as:
+ </para>
+
+<programlisting>shell> sudo rpm -i <replaceable>package</replaceable>.rpm</programlisting>
+
+ <para>
+ Again, note that
+ <filename><replaceable>package</replaceable>.rpm</filename> will
+ be the &workbench; package, for example,
+ <filename>mysql-workbench-oss-<replaceable>version</replaceable>-1fc10.x86_64.rpm</filename>,
+ and <replaceable>version</replaceable> is the &workbench; version
+ number.
+ </para>
+
+ </section>
+
+ <section id="wb-installing-linux-uninstalling">
+
+ <title>Uninstalling &workbench; on Linux</title>
+
+ <para>
+ The procedure for uninstalling &workbench; on Linux depends on the
+ packe you are using.
+ </para>
+
+ <para>
+ <emphasis role="bold">Uninstalling DEB packages</emphasis>
+ </para>
+
+ <para>
+ For Debian packages the command is:
+ </para>
+
+<programlisting>shell> sudo dpkg -r mysql-workbench-oss</programlisting>
+
+ <para>
+ This does not remove the configuration files. If you wish to also
+ remove the configuration files use:
+ </para>
+
+<programlisting>shell> sudo dpkg --purge mysql-workbench-oss</programlisting>
+
+ <para>
+ <emphasis role="bold">Uninstalling RPM packages</emphasis>
+ </para>
+
+ <para>
+ To uninstall RPM packages use:
+ </para>
+
+<programlisting>shell> sudo rpm -e mysql-workbench-oss</programlisting>
+
+ <para>
+ This does not remove the configuration files.
+ </para>
+
+ </section>
+
+ <section id="wb-installing-mac">
+
+ <title>Installing &workbench; on Mac OS X</title>
+
+ <para>
+ &workbench; is available for Mac OS X and is distributed as a DMG
+ file. The file is named
+ <filename>mysql-workbench-oss-<replaceable>version</replaceable>-osx10.5-i686.dmg</filename>,
+ where <replaceable>version</replaceable> is the &workbench;
+ version.
+ </para>
+
+ <para>
+ To install &workbench; on Mac OS X, simply download the file.
+ Double-click the downloaded file. You will be presented with the
+ installation screen:
+ </para>
+
+ <figure id="wb-installing-mac-install-screen">
+ <title>&workbench; Mac OS X Installation Screen</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="../workbench/images/published/wb-installing-mac-install-screen.png" format="PNG" lang="en"/>
+ </imageobject>
+ <textobject>
+ <phrase lang="en">&workbench; Mac OS X Installation
+ Screen</phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para>
+ Drag the &workbench; icon onto the Application icon as instructed.
+ &workbench; is now installed.
+ </para>
+
+ <para>
+ You can now launch &workbench; from the Applications folder.
+ </para>
+
+ </section>
+
+ <section id="wb-installing-mac-uninstalling">
+
+ <title>Uninstalling &workbench; on Mac OS X</title>
+
+ <para>
+ To uninstall &workbench; for Mac OS X, simply locate &workbench;
+ in the Applications folder, right-click, and select <guimenu>Move
+ to Trash</guimenu>. The application is uninstalled.
+ </para>
+
+ </section>
+
</chapter>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r15120 - in trunk: refman-5.0 refman-6.0 topic-guides/topics-5.0 topic-guides/topics-6.0 workbench | anthony.bedford | 29 May |
