MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jon Date:November 29 2008 12:49pm
Subject:svn commit - mysqldoc@docsrva: r12709 - in trunk: administrator guibook mysqlqb ndbapi refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 topic-guides/...
View as plain text  
Author: jstephens
Date: 2008-11-29 13:49:09 +0100 (Sat, 29 Nov 2008)
New Revision: 12709

Log:

Start reorg of 5.1/6.0 replication options:

  Move dynamic content (replication-options, replication-options-table)
  from replication-configuration-core.xml into own file
  (replication-options-core.xml)

  replication-configuration-core.xml -> replication-configuration.xml

  Rebuild dependencies



Added:
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-6.0/replication-options-core.xml
Removed:
   trunk/refman-5.1/replication-configuration-core.xml
   trunk/refman-6.0/replication-configuration-core.xml
Renamed/Moved:
   trunk/refman-5.1/replication-configuration.xml (from rev 12708, trunk/refman-5.1/replication-configuration-core.xml)
   trunk/refman-6.0/replication-configuration.xml (from rev 12708, trunk/refman-6.0/replication-configuration-core.xml)
Modified:
   trunk/administrator/Makefile.depends
   trunk/guibook/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/ndbapi/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/replication.xml
   trunk/refman-6.0/Makefile.depends
   trunk/refman-6.0/replication.xml
   trunk/topic-guides/topics-5.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile.depends
   trunk/topic-guides/topics-6.0/Makefile.depends


Modified: trunk/administrator/Makefile.depends
===================================================================
--- trunk/administrator/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/administrator/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1161 bytes

@@ -104,7 +104,7 @@
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \

@@ -310,7 +310,7 @@
 	images/published/replication.png
 replication_status_SOURCES = replication-status.xml $(replication_status_INCLUDES)
 replication_status_IDMAPS = \
-	../refman-5.1/metadata/replication-configuration-core.idmap
+	../refman-5.1/metadata/replication-options-core-new.idmap
 replication-status.validpure: $(replication_status_SOURCES)
 replication-status.titles: $(replication_status_SOURCES)
 replication-status.useless: $(replication_status_SOURCES)


Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/guibook/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 670 bytes

@@ -191,7 +191,7 @@
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/mysqlqb/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 575 bytes

@@ -61,7 +61,7 @@
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/credits.idmap \
-	metadata/mysqlqb_functions.idmap
+	../refman-common/metadata/regexp.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)


Modified: trunk/ndbapi/Makefile.depends
===================================================================
--- trunk/ndbapi/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/ndbapi/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1159 bytes

@@ -1005,7 +1005,7 @@
 	../refman-5.1/metadata/mysql-cluster-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap
 ndb-internals.validpure: $(ndb_internals_SOURCES)
 ndb-internals.titles: $(ndb_internals_SOURCES)
 ndb-internals.useless: $(ndb_internals_SOURCES)

@@ -1188,7 +1188,7 @@
 	../refman-5.1/metadata/mysql-cluster-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap
 ndbapi.validpure: $(ndbapi_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-5.0/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 5; 2711 bytes

@@ -1211,7 +1211,7 @@
 	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-mxj.idmap \

@@ -2112,7 +2112,8 @@
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-common/metadata/apis-php-mysql.idmap \
 	../refman-common/metadata/apis-php-mysqli.idmap \
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \

@@ -3090,7 +3091,7 @@
 	../refman-5.0/metadata/sql-syntax-replication.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/sql-syntax-transactions.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-common/metadata/bug-reports.idmap
 replication-notes.validpure: $(replication_notes_SOURCES)
 replication-notes.titles: $(replication_notes_SOURCES)

@@ -3138,7 +3139,7 @@
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-solutions.idmap \
 	../refman-5.0/metadata/sql-syntax-replication.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap
+	../refman-5.1/metadata/replication-options-core-new.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)
 replication-solutions.titles: $(replication_solutions_SOURCES)
 replication-solutions.useless: $(replication_solutions_SOURCES)

@@ -3193,7 +3194,8 @@
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/sql-syntax-transactions.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-common/metadata/bug-reports.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-5.1/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 29, Lines Added: 108, Lines Deleted: 65; 23094 bytes

@@ -270,7 +270,7 @@
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/internationalization.idmap \
 	../refman-5.1/metadata/language-structure-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/precision-math.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \

@@ -461,9 +461,11 @@
 	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/programs-server-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \

@@ -593,7 +595,7 @@
 	../refman-5.1/metadata/language-structure-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/news.idmap \
 	../refman-5.1/metadata/optimization.idmap \

@@ -764,7 +766,7 @@
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \

@@ -795,7 +797,7 @@
 	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap
 dynxml-local-mysql-cluster-optvar.validpure: $(dynxml_local_mysql_cluster_optvar_SOURCES)
 dynxml-local-mysql-cluster-optvar.titles: $(dynxml_local_mysql_cluster_optvar_SOURCES)
 dynxml-local-mysql-cluster-optvar.useless: $(dynxml_local_mysql_cluster_optvar_SOURCES)

@@ -839,14 +841,14 @@
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/programs-server-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.1/metadata/se-archive.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \

@@ -965,40 +967,34 @@
 dynxml-local-programs-server-manprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
-dynxml_local_replication_configuration_INCLUDES = \
+dynxml_local_replication_options_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/command-optvars/mysqld.xml \
 	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	replication-configuration-core.xml \
+	replication-options-core.xml \
 	versions.ent
-dynxml_local_replication_configuration_IMAGES =
-dynxml_local_replication_configuration_SOURCES = dynxml-local-replication-configuration.xml $(dynxml_local_replication_configuration_INCLUDES)
-dynxml_local_replication_configuration_IDMAPS = \
-	../refman-5.1/metadata/backup.idmap \
+dynxml_local_replication_options_IMAGES =
+dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)
+dynxml_local_replication_options_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication.idmap \
-	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/programs-admin-util-core.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
-	../refman-5.1/metadata/replication-notes.idmap \
-	../refman-5.1/metadata/sql-syntax-replication.idmap \
-	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.1/metadata/stored-programs-views.idmap
-dynxml-local-replication-configuration.validpure: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.titles: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.useless: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.valid: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration.validwarn: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-prepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-manprepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-remprepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration.xml: $(dynxml_local_replication_configuration_INCLUDES)
+	../refman-5.1/metadata/replication-options-core-new.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
+	../refman-5.1/metadata/sql-syntax-replication.idmap
+dynxml-local-replication-options.validpure: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.titles: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.useless: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.valid: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.validwarn: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-prepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-manprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
 dynxml_local_se_innodb_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -1194,10 +1190,10 @@
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.1/metadata/se-archive.idmap \
 	../refman-5.1/metadata/se-federated.idmap \

@@ -1353,7 +1349,7 @@
 	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/programs-miscellaneous.idmap \
 	../refman-5.1/metadata/programs.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/sql-syntax-compound-statements.idmap \

@@ -1758,7 +1754,7 @@
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \
 	dynxml-local-programs-server.xml \
-	dynxml-local-replication-configuration.xml \
+	dynxml-local-replication-options.xml \
 	dynxml-local-se-innodb.xml \
 	dynxml-local-se-myisam.xml \
 	errmsgs-client.xml \

@@ -1806,9 +1802,10 @@
 	programs-server-core.xml \
 	programs-using.xml \
 	programs.xml \
-	replication-configuration-core.xml \
+	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2039,7 +2036,7 @@
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/news.idmap \

@@ -2054,9 +2051,11 @@
 	../refman-5.1/metadata/programs-server-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/programs.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
 	../refman-5.1/metadata/replication-solutions.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/restrictions.idmap \

@@ -2298,7 +2297,7 @@
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -2416,8 +2415,9 @@
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/sql-syntax-replication.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap

@@ -2481,7 +2481,7 @@
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap
 mysql-cluster-security.validpure: $(mysql_cluster_security_SOURCES)
 mysql-cluster-security.titles: $(mysql_cluster_security_SOURCES)
 mysql-cluster-security.useless: $(mysql_cluster_security_SOURCES)

@@ -2538,7 +2538,7 @@
 	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
 	../refman-5.1/metadata/mysql-cluster-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap
 mysql-cluster-utilities.validpure: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.titles: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.useless: $(mysql_cluster_utilities_SOURCES)

@@ -2645,14 +2645,15 @@
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \

@@ -3040,18 +3041,42 @@
 programs-manprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
 programs-remprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
 
-replication_configuration_core_INCLUDES =
-replication_configuration_core_IMAGES =
-replication_configuration_core_SOURCES = replication-configuration-core.xml $(replication_configuration_core_INCLUDES)
-replication_configuration_core_IDMAPS =
-replication-configuration-core.validpure: $(replication_configuration_core_SOURCES)
-replication-configuration-core.titles: $(replication_configuration_core_SOURCES)
-replication-configuration-core.useless: $(replication_configuration_core_SOURCES)
-replication-configuration-core.valid: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core.validwarn: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-prepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-manprepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-remprepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
+replication_configuration_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.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)
+replication_configuration_IDMAPS = \
+	../refman-5.1/metadata/backup.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
+	../refman-5.1/metadata/sql-syntax-replication.idmap \
+	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
+	../refman-5.1/metadata/stored-programs-views.idmap
+replication-configuration.validpure: $(replication_configuration_SOURCES)
+replication-configuration.titles: $(replication_configuration_SOURCES)
+replication-configuration.useless: $(replication_configuration_SOURCES)
+replication-configuration.valid: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration.validwarn: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-prepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-manprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-remprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
 
 replication_implementation_INCLUDES = \
 	../common/fixedchars.ent \

@@ -3064,9 +3089,9 @@
 replication_implementation_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/sql-syntax-replication.idmap
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)

@@ -3094,7 +3119,7 @@
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/information-schema.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.1/metadata/replication-solutions.idmap \

@@ -3114,6 +3139,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 \

@@ -3135,7 +3173,8 @@
 replication_solutions_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/replication-solutions.idmap \
 	../refman-5.1/metadata/sql-syntax-replication.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)

@@ -3160,10 +3199,11 @@
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dynxml-local-replication-configuration.xml \
-	replication-configuration-core.xml \
+	dynxml-local-replication-options.xml \
+	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \

@@ -3187,9 +3227,11 @@
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
 	../refman-5.1/metadata/replication-solutions.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-memory.idmap \

@@ -3264,7 +3306,7 @@
 	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
-	../refman-5.1/metadata/replication-configuration-core.idmap
+	../refman-5.1/metadata/replication-options-core-new.idmap
 se-blackhole.validpure: $(se_blackhole_SOURCES)
 se-blackhole.titles: $(se_blackhole_SOURCES)
 se-blackhole.useless: $(se_blackhole_SOURCES)

@@ -3579,7 +3621,8 @@
 sql_syntax_replication_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/sql-syntax-replication.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap
 sql-syntax-replication.validpure: $(sql_syntax_replication_SOURCES)

@@ -3766,7 +3809,7 @@
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/se-archive.idmap \
 	../refman-5.1/metadata/se-blackhole.idmap \
 	../refman-5.1/metadata/se-csv.idmap \

@@ -3814,7 +3857,7 @@
 	../refman-5.1/metadata/information-schema.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-installation.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.1/metadata/restrictions.idmap \


Added: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	                        (rev 0)
+++ trunk/refman-5.1/replication-options-core.xml	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1662, Lines Deleted: 0; 59637 bytes

@@ -0,0 +1,1662 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
+%all.entities;
+]>
+<section id="replication-options">
+
+  <title>Replication Options and Variables</title>
+
+  <remark role="dynamic-dependency-list"/>
+
+  <remark role="todo">
+    This section says that it describes slave options, but there are
+    master options that need to be listed as well, like
+    show-slave-auth-info. Also, we should describe some of the relevant
+    system variables, such as sync_binlog?
+  </remark>
+
+  <para>
+    This section describes the options that you can use on slave
+    replication servers. You can specify these options either on the
+    command line or in an option file.
+  </para>
+
+  <para>
+    On the master and each slave, you must use the
+    <literal>server-id</literal> option to establish a unique
+    replication ID. For each server, you should pick a unique positive
+    integer in the range from 1 to 2<superscript>32</superscript>
+    &minus; 1, and each ID must be different from every other ID.
+    Example: <literal>server-id=3</literal>
+  </para>
+
+  <para>
+    Options that you can use on the master server for controlling binary
+    logging are described in <xref linkend="binary-log"/>.
+  </para>
+
+  <important>
+    <para>
+      Certain options are handled in a special way in order to ensure
+      that the active replication configuration is not inadvertently
+      altered or affected:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            In MySQL 5.1.16 and earlier, these options are ignored if
+            the <filename>master.info</filename> file exists (i.e. when
+            the MySQL server has already previously been configured for
+            replication). If the file exists and these options are
+            present in the <filename>my.cnf</filename> or as options on
+            the command line to <command>mysqld</command>, they are
+            silently ignored and the information in
+            <filename>master.info</filename> used instead.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis>Beginning with MySQL 5.1.17, these options are
+            deprecated. Beginning with MySQL 5.2.5, they have been
+            removed.</emphasis> In MySQL 5.1.17 and later versions of
+            MySQL 5.1, these options have no effect when
+            <command>mysqld</command> is started and an appropriate
+            warning is written to the error log. To set the replication
+            parameters associated with these you must use the
+            <literal>CHANGE MASTER TO ...</literal> statement (see
+            <xref linkend="change-master-to"/>).
+          </para>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+
+    <para>
+      The options affected are shown in this list:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <option>--master-host</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-user</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-password</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-port</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-connect-retry</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-ca</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-capath</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-cert</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-cipher</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-key</option>
+          </para>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+  </important>
+
+  <para>
+    The <filename>master.info</filename> file format in MySQL
+    &current-series; includes values corresponding to the SSL options.
+    In addition, the file format includes as its first line the number
+    of lines in the file. (See <xref linkend="slave-logs"/>.) If you
+    upgrade an older server (before MySQL 4.1.1) to a newer version, the
+    new server upgrades the <filename>master.info</filename> file to the
+    new format automatically when it starts. However, if you downgrade a
+    newer server to an older version, you should remove the first line
+    manually before starting the older server for the first time.
+  </para>
+
+  <para>
+    If no <filename>master.info</filename> file exists when the slave
+    server starts, it uses the values for those options that are
+    specified in option files or on the command line. This occurs when
+    you start the server as a replication slave for the very first time,
+    or when you have run <literal role="stmt">RESET SLAVE</literal> and
+    then have shut down and restarted the slave.
+  </para>
+
+  <para>
+    If the <filename>master.info</filename> file exists when the slave
+    server starts, the server uses its contents and ignores any options
+    that correspond to the values listed in the file. Thus, if you start
+    the slave server with different values of the startup options that
+    correspond to values in the <filename>master.info</filename> file,
+    the different values have no effect, because the server continues to
+    use the <filename>master.info</filename> file. To use different
+    values, you must either restart after removing the
+    <filename>master.info</filename> file or (preferably) use the
+    <literal role="stmt">CHANGE MASTER TO</literal> statement to reset
+    the values while the slave is running.
+  </para>
+
+  <para>
+    Suppose that you specify this option in your
+    <filename>my.cnf</filename> file:
+  </para>
+
+<programlisting>
+[mysqld]
+master-host=<replaceable>some_host</replaceable>
+</programlisting>
+
+  <para>
+    The first time you start the server as a replication slave, it reads
+    and uses that option from the <filename>my.cnf</filename> file. The
+    server then records the value in the
+    <filename>master.info</filename> file. The next time you start the
+    server, it reads the master host value from the
+    <filename>master.info</filename> file only and ignores the value in
+    the option file. If you modify the <filename>my.cnf</filename> file
+    to specify a different master host of
+    <replaceable>some_other_host</replaceable>, the change still has no
+    effect. You should use <literal role="stmt">CHANGE MASTER
+    TO</literal> instead.
+  </para>
+
+  <para>
+    This example shows a more extensive use of startup options to
+    configure a slave server:
+  </para>
+
+<programlisting>
+[mysqld]
+server-id=2
+master-host=db-master.mycompany.com
+master-port=3306
+master-user=pertinax
+master-password=freitag
+master-connect-retry=60
+report-host=db-slave.mycompany.com
+</programlisting>
+
+  <note>
+    <para>
+      Because the server gives an existing
+      <filename>master.info</filename> file precedence over the startup
+      options just described, you might prefer not to use startup
+      options for these values at all, and instead to specify them by
+      using the <literal role="stmt">CHANGE MASTER TO</literal>
+      statement. See <xref linkend="change-master-to"/>.
+    </para>
+  </note>
+
+  <para>
+    The following list describes the options and variables used for
+    controlling replication. Many of these options can be reset while
+    the server is running by using the <literal role="stmt">CHANGE
+    MASTER TO</literal> statement. Others, such as the
+    <option>--replicate-*</option> options, can be set only when the
+    slave server starts.
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para id="option_mysqld_log-slave-updates">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>log-slave-updates option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>log-slave-updates option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--log-slave-updates</option>
+      </para>
+
+      <para>
+        Normally, a slave does not log to its own binary log any updates
+        that are received from a master server. This option tells the
+        slave to log the updates performed by its SQL thread to its own
+        binary log. For this option to have any effect, the slave must
+        also be started with the <option>--log-bin</option> option to
+        enable binary logging. <option>--log-slave-updates</option> is
+        used when you want to chain replication servers. For example,
+        you might want to set up replication servers using this
+        arrangement:
+      </para>
+
+<programlisting>
+A -&gt; B -&gt; C
+</programlisting>
+
+      <para>
+        Here, <literal>A</literal> serves as the master for the slave
+        <literal>B</literal>, and <literal>B</literal> serves as the
+        master for the slave <literal>C</literal>. For this to work,
+        <literal>B</literal> must be both a master
+        <emphasis>and</emphasis> a slave. You must start both
+        <literal>A</literal> and <literal>B</literal> with
+        <option>--log-bin</option> to enable binary logging, and
+        <literal>B</literal> with the
+        <option>--log-slave-updates</option> option so that updates
+        received from <literal>A</literal> are logged by
+        <literal>B</literal> to its binary log.
+      </para>
+
+<!--
+        <formalpara>
+
+          <title><option>&ddash;log-slave-updates</option> and MySQL Cluster</title>
+
+          <para>
+            When using multi-master replication with MySQL Cluster, it
+            is possible (and sometimes preferable) to use different
+            values for <option>&ddash;log-slave-updates</option> on different
+            MySQL servers connected to the same MySQL Cluster. Consider
+            the case of 3 MySQL Clusters <literal>1</literal>,
+            <literal>2</literal>, and <literal>3</literal>, where
+            cluster <literal>1</literal> replicates to both cluster
+            <literal>2</literal> and to cluster <literal>3</literal>,
+            while cluster <literal>2</literal> also replicates to
+            cluster <literal>3</literal>. Suppose further that, in this
+            setup, each MySQL Cluster has 2 MySQL Servers acting as SQL
+            nodes with servers <literal>A</literal> and
+            <literal>B</literal> attached to cluster
+            <literal>1</literal>, servers <literal>C</literal> and
+            <literal>D</literal> attached to cluster
+            <literal>2</literal>, and servers <literal>E</literal> and
+            <literal>F</literal> attached to cluster
+            <literal>3</literal>. This is shown in the following
+            diagram:
+
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="../refman-common/images/published/cluster-replication-log-slave-updates-1.png" format="PNG"/>
+              </imageobject>
+              <textobject>
+                <phrase lang="en">Example of multi-master replication
+                with MySQL Cluster</phrase>
+              </textobject>
+            </mediaobject>
+          </para>
+
+        </formalpara>
+-->
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_log_warnings">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>log-warnings option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>log-warnings option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--log-warnings[=<replaceable>level</replaceable>]</option>
+      </para>
+
+      <para>
+        This option causes a server to print more messages to the error
+        log about what it is doing. With respect to replication, the
+        server generates warnings that it succeeded in reconnecting
+        after a network/connection failure, and informs you as to how
+        each slave thread started. This option is enabled by default; to
+        disable it, use <option>--skip-log-warnings</option>. Aborted
+        connections are not logged to the error log unless the value is
+        greater than 1.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-connect-retry">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-connect-retry option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-connect-retry option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-connect-retry=<replaceable>seconds</replaceable></option>
+      </para>
+
+      <para>
+        The number of seconds that the slave thread sleeps before trying
+        to reconnect to the master in case the master goes down or the
+        connection is lost. The value in the
+        <filename>master.info</filename> file takes precedence if it can
+        be read. If not set, the default is 60. Connection retries are
+        not invoked until the slave times out reading data from the
+        master according to the value of
+        <option>--slave-net-timeout</option>. The number of reconnection
+        attempts is limited by the <option>--master-retry-count</option>
+        option.
+      </para>
+
+      <para>
+        This option is deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-host">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-host option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-host option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-host=<replaceable>host_name</replaceable></option>
+      </para>
+
+      <para>
+        The hostname or IP number of the master replication server. The
+        value in <filename>master.info</filename> takes precedence if it
+        can be read. If no master host is specified, the slave thread
+        does not start.
+      </para>
+
+      <para>
+        This option is deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-info-file">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-info-file option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-info-file option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-info-file=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the file in which the slave records
+        information about the master. The default name is
+        <filename>master.info</filename> in the data directory.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-password">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-password option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-password option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-password=<replaceable>password</replaceable></option>
+      </para>
+
+      <para>
+        The password of the account that the slave thread uses for
+        authentication when it connects to the master. The value in the
+        <filename>master.info</filename> file takes precedence if it can
+        be read. If not set, an empty password is assumed.
+      </para>
+
+      <para>
+        This option is deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-port">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-port option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-port option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-port=<replaceable>port_number</replaceable></option>
+      </para>
+
+      <para>
+        The TCP/IP port number that the master is listening on. The
+        value in the <filename>master.info</filename> file takes
+        precedence if it can be read. If not set, the compiled-in
+        setting is assumed (normally 3306).
+      </para>
+
+      <para>
+        This option is deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-retry-count">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-retry-count option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-retry-count option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-retry-count=<replaceable>count</replaceable></option>
+      </para>
+
+      <para>
+        The number of times that the slave tries to connect to the
+        master before giving up. Reconnects are attempted at intervals
+        set by <option>--master-connect-retry</option> and reconnects
+        are triggered when data reads by the slave time out according to
+        the <option>--slave-net-timeout</option> option. The default
+        value is 86400.
+      </para>
+
+      <note>
+        <para>
+          The <command>mysqld</command> option
+          <option>--master-connect-retry</option> is deprecated as of
+          MySQL 5.1.17, and removed in MySQL 5.2.5 and later. You should
+          use the <literal>MASTER_CONNECT_RETRY</literal> option for the
+          <literal role="stmt">CHANGE MASTER TO</literal> statement
+          instead.
+        </para>
+      </note>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-ssl">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl-ca option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl-ca option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl-capath option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl-capath option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl-cert option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl-cert option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl-cipher option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl-cipher option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-ssl-key option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-ssl-key option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-ssl</option>,
+        <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>,
+        <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>,
+        <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>,
+        <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>,
+        <option>--master-ssl-key=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        These options are used for setting up a secure replication
+        connection to the master server using SSL. Their meanings are
+        the same as the corresponding <option>--ssl</option>,
+        <option>--ssl-ca</option>, <option>--ssl-capath</option>,
+        <option>--ssl-cert</option>, <option>--ssl-cipher</option>,
+        <option>--ssl-key</option> options that are described in
+        <xref linkend="ssl-options"/>. The values in the
+        <filename>master.info</filename> file take precedence if they
+        can be read.
+      </para>
+
+      <para>
+        These options are deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-user">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-user option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-user option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-user=<replaceable>user_name</replaceable></option>
+      </para>
+
+      <para>
+        The username of the account that the slave thread uses for
+        authentication when it connects to the master. This account must
+        have the <literal role="priv">REPLICATION SLAVE</literal>
+        privilege. The value in the <filename>master.info</filename>
+        file takes precedence if it can be read. If the master username
+        is not set, the name <literal>test</literal> is assumed.
+      </para>
+
+      <para>
+        This option is deprecated as of MySQL 5.1.17, and removed in
+        MySQL 5.2.5 and later.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_max-relay-log-size">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>max-relay-log-size option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>max-relay-log-size option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--max-relay-log-size=<replaceable>size</replaceable></option>
+      </para>
+
+      <para>
+        The size at which the server rotates relay log files
+        automatically. For more information, see
+        <xref linkend="slave-logs"/>. The default size is 1GB.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_read-only">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>read-only option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>read-only option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--read-only</option>
+      </para>
+
+      <para>
+        Cause the slave to allow no updates except from slave threads or
+        from users having the <literal role="priv">SUPER</literal>
+        privilege. This enables you to ensure that a slave server
+        accepts no updates from clients. This option does not apply to
+        <literal>TEMPORARY</literal> tables.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The basename for the relay log. The default basename is
+        <filename><replaceable>host_name</replaceable>-relay-bin</filename>.
+        The server creates relay log files in sequence by adding a
+        numeric suffix to the basename. You can specify the option to
+        create hostname-independent relay log names, or if your relay
+        logs tend to be big (and you don't want to decrease
+        <literal>max_relay_log_size</literal>) and you need to put them
+        in some area different from the data directory, or if you want
+        to increase speed by balancing load between disks.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-index">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-index option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-index option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-index=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the relay log index file. The default name
+        is
+        <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+        in the data directory, where
+        <replaceable>host_name</replaceable> is the name of the slave
+        server.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-info-file">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-info-file option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-info-file option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-info-file=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the file in which the slave records
+        information about the relay logs. The default name is
+        <filename>relay-log.info</filename> in the data directory.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-purge">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-purge option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-purge option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-purge={0|1}</option>
+      </para>
+
+      <para>
+        Disable or enable automatic purging of relay logs as soon as
+        they are no longer needed. The default value is 1 (enabled).
+        This is a global variable that can be changed dynamically with
+        <literal>SET GLOBAL relay_log_purge =
+        <replaceable>N</replaceable></literal>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-space-limit">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-space-limit option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-space-limit option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-space-limit=<replaceable>size</replaceable></option>
+      </para>
+
+      <para>
+        This option places an upper limit on the total size in bytes of
+        all relay logs on the slave. A value of 0 means <quote>no
+        limit.</quote> This is useful for a slave server host that has
+        limited disk space. When the limit is reached, the I/O thread
+        stops reading binary log events from the master server until the
+        SQL thread has caught up and deleted some unused relay logs.
+        Note that this limit is not absolute: There are cases where the
+        SQL thread needs more events before it can delete relay logs. In
+        that case, the I/O thread exceeds the limit until it becomes
+        possible for the SQL thread to delete some relay logs, because
+        not doing so would cause a deadlock. You should not set
+        <option>--relay-log-space-limit</option> to less than twice the
+        value of <option>--max-relay-log-size</option> (or
+        <option>--max-binlog-size</option> if
+        <option>--max-relay-log-size</option> is 0). In that case, there
+        is a chance that the I/O thread waits for free space because
+        <option>--relay-log-space-limit</option> is exceeded, but the
+        SQL thread has no relay log to purge and is unable to satisfy
+        the I/O thread. This forces the I/O thread to temporarily ignore
+        <option>--relay-log-space-limit</option>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-do-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-do-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-do-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-do-db=<replaceable>db_name</replaceable></option>
+      </para>
+
+      <para>
+        The effects of this option depend on whether statement-based or
+        row-based replication is in use.
+      </para>
+
+      <formalpara>
+
+        <title>Statement-based replication</title>
+
+        <para>
+          Tell the slave to restrict replication to statements where the
+          default database (that is, the one selected by
+          <literal role="stmt">USE</literal>) is
+          <replaceable>db_name</replaceable>. To specify more than one
+          database, use this option multiple times, once for each
+          database. Note that this does not replicate cross-database
+          statements such as <literal>UPDATE
+          <replaceable>some_db.some_table</replaceable> SET
+          foo='bar'</literal> while having selected a different database
+          or no database.
+        </para>
+
+      </formalpara>
+
+      <warning>
+        <para>
+          To specify multiple databases you <emphasis>must</emphasis>
+          use multiple instances of this option. Because database names
+          can contain commas, if you supply a comma separated list then
+          the list will be treated as the name of a single database.
+        </para>
+      </warning>
+
+      <para>
+        An example of what does not work as you might expect when using
+        statement-based replication: If the slave is started with
+        <option>--replicate-do-db=sales</option> and you issue the
+        following statements on the master, the
+        <literal role="stmt">UPDATE</literal> statement is
+        <emphasis>not</emphasis> replicated:
+
+<programlisting>
+USE prices;
+UPDATE sales.january SET amount=amount+1000;
+</programlisting>
+
+        The main reason for this <quote>just check the default
+        database</quote> behavior is that it is difficult from the
+        statement alone to know whether it should be replicated (for
+        example, if you are using multiple-table
+        <literal role="stmt">DELETE</literal> statements or
+        multiple-table <literal role="stmt">UPDATE</literal> statements
+        that act across multiple databases). It is also faster to check
+        only the default database rather than all databases if there is
+        no need.
+      </para>
+
+      <formalpara>
+
+        <title>Row-based replication</title>
+
+        <para>
+          Tell the slave to restrict replication to database
+          <replaceable>db_name</replaceable>. Only tables belonging to
+          <replaceable>db_name</replaceable> are changed; the current
+          database has no effect on this. For example, suppose that the
+          slave is started with <option>--replicate-do-db=sales</option>
+          and row-based replication is in effect; then the following
+          statements are run on the master:
+
+<programlisting>
+USE prices;
+UPDATE sales.february SET amount=amount+100;
+</programlisting>
+
+          The <literal>february</literal> table in the
+          <literal>sales</literal> database on the slave is changed in
+          accordance with the <literal role="stmt">UPDATE</literal>
+          statement, and this takes place whether or not the
+          <literal role="stmt">USE</literal> statement was issued.
+          However, issuing the following statements on the master has no
+          effect on the slave when using row-based replication and
+          <option>--replicate-do-db=sales</option>:
+
+<programlisting>
+USE prices;
+UPDATE prices.march SET amount=amount-25;
+</programlisting>
+
+          Even if the statement <literal>USE prices</literal> were
+          changed to <literal>USE sales</literal>, the
+          <literal role="stmt">UPDATE</literal> statement&apos;s effects
+          would still not be replicated.
+        </para>
+
+      </formalpara>
+
+      <para>
+        Another importance difference in how
+        <option>--replicate-do-db</option> is handled in statement-based
+        replication as opposed to row-based replication occurs with
+        regard to statements that refer to multiple databases. Suppose
+        the slave is started with
+        <option>--replicate-do-db=db1</option>, and the following
+        statements are executed on the master:
+
+<programlisting>
+USE db1;
+UPDATE db1.table1 SET col1 = 10, db2.table2 SET col2 = 20;
+</programlisting>
+
+        If you are using statement-based replication, then both tables
+        are updated on the slave. However, when using row-based
+        replication, only <literal>table1</literal> is effected on the
+        slave; since <literal>table2</literal> is in a different
+        database, it is not changed by the
+        <literal role="stmt">UPDATE</literal>. Now suppose that, instead
+        of the <literal>USE db1</literal> statement, a <literal>USE
+        db4</literal> statement was used:
+
+<programlisting>
+USE db4;
+UPDATE db1.table1 SET col1 = 10, db2.table2 SET col2 = 20;
+</programlisting>
+
+        In this case, the <literal role="stmt">UPDATE</literal>
+        statement would have no effect on the slave when using
+        statement-based replication. However, if using row-based
+        replication, the <literal role="stmt">UPDATE</literal> would
+        change <literal>table1</literal> on the slave, but not
+        <literal>table2</literal> &mdash; in other words, only tables in
+        the database named by <option>--replicate-do-db</option> are
+        changed, and the choice of current database has no effect on
+        this behavior.
+      </para>
+
+      <para>
+        If you need cross-database updates to work, use
+        <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
+        instead. See <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-do-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-do-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-do-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tell the slave thread to restrict replication to the specified
+        table. To specify more than one table, use this option multiple
+        times, once for each table. This works for cross-database
+        updates, in contrast to <option>--replicate-do-db</option>. See
+        <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-ignore-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-ignore-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-ignore-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-ignore-db=<replaceable>db_name</replaceable></option>
+      </para>
+
+      <para>
+        As with <option>--replicate-do-db</option>, the effects of this
+        option depend on whether statement-based or row-based
+        replication is in use.
+      </para>
+
+      <formalpara>
+
+        <title>Statement-based replication</title>
+
+        <para>
+          Tells the slave to not replicate any statement where the
+          default database (that is, the one selected by
+          <literal role="stmt">USE</literal>) is
+          <replaceable>db_name</replaceable>.
+        </para>
+
+      </formalpara>
+
+      <formalpara>
+
+        <title>Row-based replication</title>
+
+        <para>
+          Tells the slave not to update any tables in the database
+          <replaceable>db_name</replaceable>. The current database has
+          no effect.
+        </para>
+
+      </formalpara>
+
+      <para>
+        When using statement-based replication, the following example
+        does not work as you might expect. Suppose that the slave is
+        started with <option>--replicate-ignore-db=sales</option> and
+        you issue the following statements on the master:
+
+<programlisting>
+USE prices;
+UPDATE sales.january SET amount=amount+1000;
+</programlisting>
+
+        The <literal role="stmt">UPDATE</literal> statement
+        <emphasis>is</emphasis> replicated in such a case because
+        <option>--replicate-ignore-db</option> applies only to the
+        default database (determined by the
+        <literal role="stmt">USE</literal> statement). Because the
+        <literal>sales</literal> database was specified explicitly in
+        the statement, the statement has not been filtered. However,
+        when using row-based replication, the
+        <literal role="stmt">UPDATE</literal> statement&apos;s effects
+        are <emphasis>not</emphasis> propagated to the slave, and the
+        slave&apos;s copy of the <literal>sales.january</literal> table
+        is unchanged; in this instance,
+        <option>--replicate-ignore-db=sales</option> causes
+        <emphasis>all</emphasis> changes made to tables in the
+        master&apos;s copy of the <literal>sales</literal> database to
+        be ignored by the slave.
+      </para>
+
+      <para>
+        To specify more than one database to ignore, use this option
+        multiple times, once for each database. Because database names
+        can contain commas, if you supply a comma separated list then
+        the list will be treated as the name of a single database.
+      </para>
+
+      <para>
+        You should not use this option if you are using cross-database
+        updates and you do not want these updates to be replicated. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        If you need cross-database updates to work, use
+        <option>--replicate-wild-ignore-table=<replaceable>db_name</replaceable>.%</option>
+        instead. See <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-ignore-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-ignore-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-ignore-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread to not replicate any statement that
+        updates the specified table, even if any other tables might be
+        updated by the same statement. To specify more than one table to
+        ignore, use this option multiple times, once for each table.
+        This works for cross-database updates, in contrast to
+        <option>--replicate-ignore-db</option>. See
+        <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-rewrite-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-rewrite-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-rewrite-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave to translate the default database (that is, the
+        one selected by <literal role="stmt">USE</literal>) to
+        <replaceable>to_name</replaceable> if it was
+        <replaceable>from_name</replaceable> on the master. Only
+        statements involving tables are affected (not statements such as
+        <literal role="stmt">CREATE DATABASE</literal>,
+        <literal role="stmt">DROP DATABASE</literal>, and
+        <literal role="stmt">ALTER DATABASE</literal>), and only if
+        <replaceable>from_name</replaceable> is the default database on
+        the master. This does not work for cross-database updates. To
+        specify multiple rewrites, use this option multiple times. The
+        server uses the first one with a
+        <replaceable>from_name</replaceable> value that matches. The
+        database name translation is done <emphasis>before</emphasis>
+        the <option>--replicate-*</option> rules are tested.
+      </para>
+
+      <para>
+        If you use this option on the command line and the
+        <quote><literal>&gt;</literal></quote> character is special to
+        your command interpreter, quote the option value. For example:
+      </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
+</programlisting>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-same-server-id">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-same-server-id option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-same-server-id option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-same-server-id</option>
+      </para>
+
+      <para>
+        To be used on slave servers. Usually you should use the default
+        setting of 0, to prevent infinite loops caused by circular
+        replication. If set to 1, the slave does not skip events having
+        its own server ID. Normally, this is useful only in rare
+        configurations. Cannot be set to 1 if
+        <option>--log-slave-updates</option> is used. Note that by
+        default the slave I/O thread does not even write binary log
+        events to the relay log if they have the slave's server ID (this
+        optimization helps save disk usage). So if you want to use
+        <option>--replicate-same-server-id</option>, be sure to start
+        the slave with this option before you make the slave read its
+        own events that you want the slave SQL thread to execute.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-wild-do-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-wild-do-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-wild-do-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread to restrict replication to statements
+        where any of the updated tables match the specified database and
+        table name patterns. Patterns can contain the
+        <quote><literal>%</literal></quote> and
+        <quote><literal>_</literal></quote> wildcard characters, which
+        have the same meaning as for the
+        <literal role="op">LIKE</literal> pattern-matching operator. To
+        specify more than one table, use this option multiple times,
+        once for each table. This works for cross-database updates. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        Example: <option>--replicate-wild-do-table=foo%.bar%</option>
+        replicates only updates that use a table where the database name
+        starts with <literal>foo</literal> and the table name starts
+        with <literal>bar</literal>.
+      </para>
+
+      <para>
+        If the table name pattern is <literal>%</literal>, it matches
+        any table name and the option also applies to database-level
+        statements (<literal role="stmt">CREATE DATABASE</literal>,
+        <literal role="stmt">DROP DATABASE</literal>, and
+        <literal role="stmt">ALTER DATABASE</literal>). For example, if
+        you use <option>--replicate-wild-do-table=foo%.%</option>,
+        database-level statements are replicated if the database name
+        matches the pattern <literal>foo%</literal>.
+      </para>
+
+      <para>
+        To include literal wildcard characters in the database or table
+        name patterns, escape them with a backslash. For example, to
+        replicate all tables of a database that is named
+        <literal>my_own%db</literal>, but not replicate tables from the
+        <literal>my1ownAABCdb</literal> database, you should escape the
+        <quote><literal>_</literal></quote> and
+        <quote><literal>%</literal></quote> characters like this:
+        <option>--replicate-wild-do-table=my\_own\%db</option>. If
+        you're using the option on the command line, you might need to
+        double the backslashes or quote the option value, depending on
+        your command interpreter. For example, with the
+        <command>bash</command> shell, you would need to type
+        <option>--replicate-wild-do-table=my\\_own\\%db</option>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-wild-ignore-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-wild-ignore-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-wild-ignore-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread not to replicate a statement where any
+        table matches the given wildcard pattern. To specify more than
+        one table to ignore, use this option multiple times, once for
+        each table. This works for cross-database updates. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        Example:
+        <option>--replicate-wild-ignore-table=foo%.bar%</option> does
+        not replicate updates that use a table where the database name
+        starts with <literal>foo</literal> and the table name starts
+        with <literal>bar</literal>.
+      </para>
+
+      <para>
+        For information about how matching works, see the description of
+        the <option>--replicate-wild-do-table</option> option. The rules
+        for including literal wildcard characters in the option value
+        are the same as for
+        <option>--replicate-wild-ignore-table</option> as well.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-host">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-host option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-host option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-host=<replaceable>host_name</replaceable></option>
+      </para>
+
+      <para>
+        The hostname or IP number of the slave to be reported to the
+        master during slave registration. This value appears in the
+        output of <literal role="stmt">SHOW SLAVE HOSTS</literal> on the
+        master server. Leave the value unset if you do not want the
+        slave to register itself with the master. Note that it is not
+        sufficient for the master to simply read the IP number of the
+        slave from the TCP/IP socket after the slave connects. Due to
+        NAT and other routing issues, that IP may not be valid for
+        connecting to the slave from the master or other hosts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <remark role="note">
+        Currently, this option is of no real interest; it is meant for
+        failover replication, which is not yet implemented.
+      </remark>
+
+      <para id="option_mysqld_report-port">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-port option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-port option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-port=<replaceable>slave_port_num</replaceable></option>
+      </para>
+
+      <para>
+        The TCP/IP port number for connecting to the slave, to be
+        reported to the master during slave registration. Set this only
+        if the slave is listening on a non-default port or if you have a
+        special tunnel from the master or other clients to the slave. If
+        you are not sure, do not use this option.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-password">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-password option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-password option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-password=<replaceable>password</replaceable></option>
+      </para>
+
+      <para>
+        The account password of the slave to be reported to the master
+        during slave registration. This value appears in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server if the <option>--show-slave-auth-info</option> option is
+        given.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-user">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-user option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-user option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-user=<replaceable>user_name</replaceable></option>
+      </para>
+
+      <para>
+        The account username of the slave to be reported to the master
+        during slave registration. This value appears in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server if the <option>--show-slave-auth-info</option> option is
+        given.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_show-slave-auth-info">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>show-slave-auth-info option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>show-slave-auth-info option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--show-slave-auth-info</option>
+      </para>
+
+      <para>
+        Display slave usernames and passwords in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server for slaves started with the
+        <option>--report-user</option> and
+        <option>--report-password</option> options.
+      </para>
+    </listitem>
+
+    <listitem>
+      <remark role="note">
+        Currently, this option is of no real interest; it is meant for
+        failover replication, which is not yet implemented.
+      </remark>
+
+      <para id="option_mysqld_skip-slave-start">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>skip-slave-start option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>skip-slave-start option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--skip-slave-start</option>
+      </para>
+
+      <para>
+        Tells the slave server not to start the slave threads when the
+        server starts. To start the threads later, use a
+        <literal role="stmt">START SLAVE</literal> statement.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="sysvar_slave_compressed_protocol">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave_compressed_protocol option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave_compressed_protocol option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave_compressed_protocol={0|1}</option>
+      </para>
+
+      <para>
+        If this option is set to 1, use compression for the slave/master
+        protocol if both the slave and the master support it. The
+        default is 0 (no compression).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave-load-tmpdir">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-load-tmpdir option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-load-tmpdir option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name of the directory where the slave creates temporary
+        files. This option is by default equal to the value of the
+        <literal>tmpdir</literal> system variable. When the slave SQL
+        thread replicates a
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> statement, it extracts the file to be loaded
+        from the relay log into temporary files, and then loads these
+        into the table. If the file loaded on the master is huge, the
+        temporary files on the slave are huge, too. Therefore, it might
+        be advisable to use this option to tell the slave to put
+        temporary files in a directory located in some filesystem that
+        has a lot of available space. In that case, the relay logs are
+        huge as well, so you might also want to use the
+        <option>--relay-log</option> option to place the relay logs in
+        that filesystem.
+      </para>
+
+      <para>
+        The directory specified by this option should be located in a
+        disk-based filesystem (not a memory-based filesystem) because
+        the temporary files used to replicate
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> must survive machine restarts. The directory
+        also should not be one that is cleared by the operating system
+        during the system startup process.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave-net-timeout">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-net-timeout option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-net-timeout option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-net-timeout=<replaceable>seconds</replaceable></option>
+      </para>
+
+      <para>
+        The number of seconds to wait for more data from the master
+        before the slave considers the connection broken, aborts the
+        read, and tries to reconnect. The first retry occurs immediately
+        after the timeout. The interval between retries is controlled by
+        the <literal>MASTER_CONNECT_RETRY</literal> option for the
+        <literal role="stmt">CHANGE MASTER TO</literal> statement or
+        <option>--master-connect-retry</option> option, and the number
+        of reconnection attempts is limited by the
+        <option>--master-retry-count</option> option. The default is
+        3600 seconds (one hour).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave_skip_errors">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-skip-errors option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-skip-errors option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
+      </para>
+
+      <para>
+        Normally, replication stops when an error occurs on the slave.
+        This gives you the opportunity to resolve the inconsistency in
+        the data manually. This option tells the slave SQL thread to
+        continue replication when a statement returns any of the errors
+        listed in the option value.
+      </para>
+
+      <para>
+        Do not use this option unless you fully understand why you are
+        getting errors. If there are no bugs in your replication setup
+        and client programs, and no bugs in MySQL itself, an error that
+        stops replication should never occur. Indiscriminate use of this
+        option results in slaves becoming hopelessly out of synchrony
+        with the master, with you having no idea why this has occurred.
+      </para>
+
+      <para>
+        For error codes, you should use the numbers provided by the
+        error message in your slave error log and in the output of
+        <literal role="stmt">SHOW SLAVE STATUS</literal>.
+        <xref linkend="error-handling"/>, lists server error codes.
+      </para>
+
+      <para>
+        You can also (but should not) use the very non-recommended value
+        of <literal>all</literal> to cause the slave to ignore all error
+        messages and keeps going regardless of what happens. Needless to
+        say, if you use <literal>all</literal>, there are no guarantees
+        regarding the integrity of your data. Please do not complain (or
+        file bug reports) in this case if the slave's data is not
+        anywhere close to what it is on the master. <emphasis>You have
+        been warned</emphasis>.
+      </para>
+
+      <para>
+        Examples:
+      </para>
+
+<programlisting>
+--slave-skip-errors=1062,1053
+--slave-skip-errors=all
+</programlisting>
+    </listitem>
+
+  </itemizedlist>
+
+  <remark role="todo">
+    Add here: Discuss replication-related system variables. sync_binlog.
+  </remark>
+
+  <section id="replication-options-table">
+
+    <title>Replication Option and Variable Reference</title>
+
+    <para>
+      The following table provides a list of the command-line options,
+      server and status variables applicable within
+      <literal>mysqld</literal> relating to replication and basic
+      information about each. <xref linkend="replication-options"/>,
+      provides more detailed information about these options and
+      variables.
+    </para>
+
+    <para>
+      For a table showing <emphasis>all</emphasis> command-line options,
+      server and status variables available for use with
+      <command>mysqld</command>, see
+      <xref linkend="mysqld-option-tables"/>.
+    </para>
+
+    <para condition="dynamic:optvar:fullsummary" role="5.1:mysqld:section-replication"/>
+
+  </section>
+
+</section>


Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-5.1/replication.xml	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 589 bytes

@@ -164,7 +164,7 @@
 
   </formalpara>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-replication-configuration.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-solutions.xml"/>
 


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-5.1-maria/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 4, Lines Added: 7, Lines Deleted: 4; 2275 bytes

@@ -486,7 +486,7 @@
 	../refman-5.1/dynxml-local-programs-admin-util.xml \
 	../refman-5.1/dynxml-local-programs-client.xml \
 	../refman-5.1/dynxml-local-programs-server.xml \
-	../refman-5.1/dynxml-local-replication-configuration.xml \
+	../refman-5.1/dynxml-local-replication-options.xml \
 	../refman-5.1/dynxml-local-se-innodb.xml \
 	../refman-5.1/dynxml-local-se-myisam.xml \
 	../refman-5.1/errmsgs-client.xml \

@@ -515,9 +515,10 @@
 	../refman-5.1/programs-server-core.xml \
 	../refman-5.1/programs-using.xml \
 	../refman-5.1/programs.xml \
-	../refman-5.1/replication-configuration-core.xml \
+	../refman-5.1/replication-configuration.xml \
 	../refman-5.1/replication-implementation.xml \
 	../refman-5.1/replication-notes.xml \
+	../refman-5.1/replication-options-core.xml \
 	../refman-5.1/replication-solutions.xml \
 	../refman-5.1/replication.xml \
 	../refman-5.1/restrictions.xml \

@@ -749,9 +750,11 @@
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/replication-configuration-new.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/storage-engines.idmap \
 	../refman-6.0/metadata/manual.idmap \
 	../refman-6.0/metadata/se-maria-core.idmap \

@@ -931,7 +934,7 @@
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-configuration-core.idmap \
+	../refman-5.1/metadata/replication-options-core-new.idmap \
 	../refman-5.1/metadata/spatial-extensions.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-6.0/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 18, Lines Added: 86, Lines Deleted: 51; 15997 bytes

@@ -458,9 +458,10 @@
 	../refman-6.0/metadata/programs-installation.idmap \
 	../refman-6.0/metadata/programs-server-core.idmap \
 	../refman-6.0/metadata/programs-using.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../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.idmap \
 	../refman-6.0/metadata/se-falcon-core.idmap \
 	../refman-6.0/metadata/se-innodb-core.idmap \

@@ -655,7 +656,7 @@
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-solutions.idmap \
 	../refman-6.0/metadata/se-falcon-core.idmap \
 	../refman-6.0/metadata/se-innodb-core.idmap \

@@ -773,39 +774,32 @@
 dynxml-local-programs-server-manprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
-dynxml_local_replication_configuration_INCLUDES = \
+dynxml_local_replication_options_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/command-optvars/mysqld.xml \
 	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	replication-configuration-core.xml \
+	replication-options-core.xml \
 	versions.ent
-dynxml_local_replication_configuration_IMAGES =
-dynxml_local_replication_configuration_SOURCES = dynxml-local-replication-configuration.xml $(dynxml_local_replication_configuration_INCLUDES)
-dynxml_local_replication_configuration_IDMAPS = \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-6.0/metadata/backup.idmap \
+dynxml_local_replication_options_IMAGES =
+dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)
+dynxml_local_replication_options_IDMAPS = \
 	../refman-6.0/metadata/dba-core.idmap \
 	../refman-6.0/metadata/errors-problems.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
-	../refman-6.0/metadata/replication-notes.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
-dynxml-local-replication-configuration.validpure: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.titles: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.useless: $(dynxml_local_replication_configuration_SOURCES)
-dynxml-local-replication-configuration.valid: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration.validwarn: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-prepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-manprepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration-remprepped.xml: $(dynxml_local_replication_configuration_SOURCES) $(dynxml_local_replication_configuration_IDMAPS)
-dynxml-local-replication-configuration.xml: $(dynxml_local_replication_configuration_INCLUDES)
+	../refman-6.0/metadata/replication-options-core.idmap \
+	../refman-6.0/metadata/sql-syntax-replication.idmap
+dynxml-local-replication-options.validpure: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.titles: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.useless: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.valid: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.validwarn: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-prepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-manprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
 dynxml_local_se_falcon_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -1067,7 +1061,7 @@
 	../refman-6.0/metadata/installing-core.idmap \
 	../refman-6.0/metadata/internationalization.idmap \
 	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-notes.idmap \
 	../refman-6.0/metadata/se-archive.idmap \
 	../refman-6.0/metadata/se-falcon-core.idmap \

@@ -1519,7 +1513,7 @@
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \
 	dynxml-local-programs-server.xml \
-	dynxml-local-replication-configuration.xml \
+	dynxml-local-replication-options.xml \
 	dynxml-local-se-falcon.xml \
 	dynxml-local-se-innodb.xml \
 	dynxml-local-se-maria.xml \

@@ -1551,9 +1545,10 @@
 	programs-server-core.xml \
 	programs-using.xml \
 	programs.xml \
-	replication-configuration-core.xml \
+	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -1771,9 +1766,10 @@
 	../refman-6.0/metadata/programs-server-core.idmap \
 	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/programs.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../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 \

@@ -2201,18 +2197,40 @@
 programs-manprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
 programs-remprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
 
-replication_configuration_core_INCLUDES =
-replication_configuration_core_IMAGES =
-replication_configuration_core_SOURCES = replication-configuration-core.xml $(replication_configuration_core_INCLUDES)
-replication_configuration_core_IDMAPS =
-replication-configuration-core.validpure: $(replication_configuration_core_SOURCES)
-replication-configuration-core.titles: $(replication_configuration_core_SOURCES)
-replication-configuration-core.useless: $(replication_configuration_core_SOURCES)
-replication-configuration-core.valid: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core.validwarn: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-prepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-manprepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
-replication-configuration-core-remprepped.xml: $(replication_configuration_core_SOURCES) $(replication_configuration_core_IDMAPS)
+replication_configuration_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.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)
+replication_configuration_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/backup.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../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
+replication-configuration.validpure: $(replication_configuration_SOURCES)
+replication-configuration.titles: $(replication_configuration_SOURCES)
+replication-configuration.useless: $(replication_configuration_SOURCES)
+replication-configuration.valid: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration.validwarn: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-prepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-manprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-remprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
 
 replication_implementation_INCLUDES = \
 	../common/fixedchars.ent \

@@ -2225,9 +2243,9 @@
 replication_implementation_IDMAPS = \
 	../refman-6.0/metadata/dba-core.idmap \
 	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/replication-configuration-core.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
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)

@@ -2255,7 +2273,7 @@
 	../refman-6.0/metadata/errors-problems.idmap \
 	../refman-6.0/metadata/functions-core.idmap \
 	../refman-6.0/metadata/information-schema.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../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-solutions.idmap \

@@ -2275,6 +2293,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 \

@@ -2318,7 +2349,8 @@
 replication_solutions_IDMAPS = \
 	../refman-6.0/metadata/dba-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/replication-solutions.idmap \
 	../refman-6.0/metadata/sql-syntax-replication.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)

@@ -2354,10 +2386,11 @@
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dynxml-local-replication-configuration.xml \
-	replication-configuration-core.xml \
+	dynxml-local-replication-options.xml \
+	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \

@@ -2391,9 +2424,10 @@
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../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.idmap \

@@ -2468,7 +2502,7 @@
 	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
-	../refman-6.0/metadata/replication-configuration-core.idmap
+	../refman-6.0/metadata/replication-options-core.idmap
 se-blackhole.validpure: $(se_blackhole_SOURCES)
 se-blackhole.titles: $(se_blackhole_SOURCES)
 se-blackhole.useless: $(se_blackhole_SOURCES)

@@ -2803,7 +2837,8 @@
 sql_syntax_replication_IDMAPS = \
 	../refman-6.0/metadata/dba-core.idmap \
 	../refman-6.0/metadata/functions-core.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../refman-6.0/metadata/replication-configuration.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
 sql-syntax-replication.validpure: $(sql_syntax_replication_SOURCES)

@@ -2992,7 +3027,7 @@
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
 	../refman-6.0/metadata/programs-using.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/se-archive.idmap \
 	../refman-6.0/metadata/se-blackhole.idmap \
 	../refman-6.0/metadata/se-csv.idmap \

@@ -3043,7 +3078,7 @@
 	../refman-6.0/metadata/information-schema.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
 	../refman-6.0/metadata/programs-installation.idmap \
-	../refman-6.0/metadata/replication-configuration-core.idmap \
+	../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/restrictions.idmap \


Added: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	                        (rev 0)
+++ trunk/refman-6.0/replication-options-core.xml	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1348, Lines Deleted: 0; 48880 bytes

@@ -0,0 +1,1348 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
+%all.entities;
+]>
+<section id="replication-options">
+
+  <title>Replication Options and Variables</title>
+
+  <remark role="dynamic-dependency-list"/>
+
+  <remark role="todo">
+    This section says that it describes slave options, but there are
+    master options that need to be listed as well, like
+    show-slave-auth-info. Also, we should describe some of the relevant
+    system variables, such as sync_binlog?
+  </remark>
+
+  <para>
+    This section describes the options that you can use on slave
+    replication servers. You can specify these options either on the
+    command line or in an option file.
+  </para>
+
+  <para>
+    On the master and each slave, you must use the
+    <literal>server-id</literal> option to establish a unique
+    replication ID. For each server, you should pick a unique positive
+    integer in the range from 1 to 2<superscript>32</superscript>
+    &minus; 1, and each ID must be different from every other ID.
+    Example: <literal>server-id=3</literal>
+  </para>
+
+  <para>
+    Options that you can use on the master server for controlling binary
+    logging are described in <xref linkend="binary-log"/>.
+  </para>
+
+  <important>
+    <para>
+      <emphasis>The following options were removed in MySQL 5.2.5. If
+      attempt to start <command>mysqld</command> with any of these
+      options in MySQL 6.0, the server aborts with an <errortext>unknown
+      variable</errortext> error.</emphasis> To set the replication
+      parameters formerly associated with these options, you must use
+      the <literal>CHANGE MASTER TO ...</literal> statement (see
+      <xref linkend="change-master-to"/>).
+    </para>
+
+    <para>
+      The options affected are shown in this list:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <option>--master-host</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-user</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-password</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-port</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-connect-retry</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-ca</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-capath</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-cert</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-cipher</option>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <option>--master-ssl-key</option>
+          </para>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+  </important>
+
+  <para>
+    The <filename>master.info</filename> file format in MySQL
+    &current-series; includes values corresponding to the SSL options.
+    In addition, the file format includes as its first line the number
+    of lines in the file. (See <xref linkend="slave-logs"/>.) If you
+    upgrade an older server (before MySQL 4.1.1) to a newer version, the
+    new server upgrades the <filename>master.info</filename> file to the
+    new format automatically when it starts. However, if you downgrade a
+    newer server to an older version, you should remove the first line
+    manually before starting the older server for the first time.
+  </para>
+
+  <para>
+    If no <filename>master.info</filename> file exists when the slave
+    server starts, it uses the values for those options that are
+    specified in option files or on the command line. This occurs when
+    you start the server as a replication slave for the very first time,
+    or when you have run <literal role="stmt">RESET SLAVE</literal> and
+    then have shut down and restarted the slave.
+  </para>
+
+  <para>
+    If the <filename>master.info</filename> file exists when the slave
+    server starts, the server uses its contents and ignores any options
+    that correspond to the values listed in the file. Thus, if you start
+    the slave server with different values of the startup options that
+    correspond to values in the <filename>master.info</filename> file,
+    the different values have no effect, because the server continues to
+    use the <filename>master.info</filename> file. To use different
+    values, you must either restart after removing the
+    <filename>master.info</filename> file or (preferably) use the
+    <literal role="stmt">CHANGE MASTER TO</literal> statement to reset
+    the values while the slave is running.
+  </para>
+
+  <para>
+    Suppose that you specify this option in your
+    <filename>my.cnf</filename> file:
+  </para>
+
+<programlisting>
+[mysqld]
+master-host=<replaceable>some_host</replaceable>
+</programlisting>
+
+  <para>
+    The first time you start the server as a replication slave, it reads
+    and uses that option from the <filename>my.cnf</filename> file. The
+    server then records the value in the
+    <filename>master.info</filename> file. The next time you start the
+    server, it reads the master host value from the
+    <filename>master.info</filename> file only and ignores the value in
+    the option file. If you modify the <filename>my.cnf</filename> file
+    to specify a different master host of
+    <replaceable>some_other_host</replaceable>, the change still has no
+    effect. You should use <literal role="stmt">CHANGE MASTER
+    TO</literal> instead.
+  </para>
+
+  <para>
+    This example shows a more extensive use of startup options to
+    configure a slave server:
+  </para>
+
+<programlisting>
+[mysqld]
+server-id=2
+master-host=db-master.mycompany.com
+master-port=3306
+master-user=pertinax
+master-password=freitag
+master-connect-retry=60
+report-host=db-slave.mycompany.com
+</programlisting>
+
+  <note>
+    <para>
+      Because the server gives an existing
+      <filename>master.info</filename> file precedence over the startup
+      options just described, you might prefer not to use startup
+      options for these values at all, and instead to specify them by
+      using the <literal role="stmt">CHANGE MASTER TO</literal>
+      statement. See <xref linkend="change-master-to"/>.
+    </para>
+  </note>
+
+  <para>
+    The following list describes the options and variables used for
+    controlling replication. Many of these options can be reset while
+    the server is running by using the <literal role="stmt">CHANGE
+    MASTER TO</literal> statement. Others, such as the
+    <option>--replicate-*</option> options, can be set only when the
+    slave server starts.
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para id="option_mysqld_log-slave-updates">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>log-slave-updates option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>log-slave-updates option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--log-slave-updates</option>
+      </para>
+
+      <para>
+        Normally, a slave does not log to its own binary log any updates
+        that are received from a master server. This option tells the
+        slave to log the updates performed by its SQL thread to its own
+        binary log. For this option to have any effect, the slave must
+        also be started with the <option>--log-bin</option> option to
+        enable binary logging. <option>--log-slave-updates</option> is
+        used when you want to chain replication servers. For example,
+        you might want to set up replication servers using this
+        arrangement:
+      </para>
+
+<programlisting>
+A -&gt; B -&gt; C
+</programlisting>
+
+      <para>
+        Here, <literal>A</literal> serves as the master for the slave
+        <literal>B</literal>, and <literal>B</literal> serves as the
+        master for the slave <literal>C</literal>. For this to work,
+        <literal>B</literal> must be both a master
+        <emphasis>and</emphasis> a slave. You must start both
+        <literal>A</literal> and <literal>B</literal> with
+        <option>--log-bin</option> to enable binary logging, and
+        <literal>B</literal> with the
+        <option>--log-slave-updates</option> option so that updates
+        received from <literal>A</literal> are logged by
+        <literal>B</literal> to its binary log.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_log_warnings">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>log-warnings option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>log-warnings option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--log-warnings[=<replaceable>level</replaceable>]</option>
+      </para>
+
+      <para>
+        This option causes a server to print more messages to the error
+        log about what it is doing. With respect to replication, the
+        server generates warnings that it succeeded in reconnecting
+        after a network/connection failure, and informs you as to how
+        each slave thread started. This option is enabled by default; to
+        disable it, use <option>--skip-log-warnings</option>. Aborted
+        connections are not logged to the error log unless the value is
+        greater than 1.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-info-file">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-info-file option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-info-file option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-info-file=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the file in which the slave records
+        information about the master. The default name is
+        <filename>master.info</filename> in the data directory.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_master-retry-count">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>master-retry-count option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>master-retry-count option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--master-retry-count=<replaceable>count</replaceable></option>
+      </para>
+
+      <para>
+        The number of times that the slave tries to connect to the
+        master before giving up. Reconnects are attempted at intervals
+        set by the <literal>MASTER_CONNECT_RETRY</literal> option for
+        the <literal role="stmt">CHANGE MASTER TO</literal> statement
+        and reconnects are triggered when data reads by the slave time
+        out according to the <option>--slave-net-timeout</option>
+        option. The default value is 86400.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_max-relay-log-size">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>max-relay-log-size option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>max-relay-log-size option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--max-relay-log-size=<replaceable>size</replaceable></option>
+      </para>
+
+      <para>
+        The size at which the server rotates relay log files
+        automatically. For more information, see
+        <xref linkend="slave-logs"/>. The default size is 1GB.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_read-only">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>read-only option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>read-only option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--read-only</option>
+      </para>
+
+      <para>
+        Cause the slave to allow no updates except from slave threads or
+        from users having the <literal role="priv">SUPER</literal>
+        privilege. This enables you to ensure that a slave server
+        accepts no updates from clients. This option does not apply to
+        <literal>TEMPORARY</literal> tables.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The basename for the relay log. The default basename is
+        <filename><replaceable>host_name</replaceable>-relay-bin</filename>.
+        The server creates relay log files in sequence by adding a
+        numeric suffix to the basename. You can specify the option to
+        create hostname-independent relay log names, or if your relay
+        logs tend to be big (and you don't want to decrease
+        <literal>max_relay_log_size</literal>) and you need to put them
+        in some area different from the data directory, or if you want
+        to increase speed by balancing load between disks.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-index">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-index option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-index option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-index=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the relay log index file. The default name
+        is
+        <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+        in the data directory, where
+        <replaceable>host_name</replaceable> is the name of the slave
+        server.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-info-file">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-info-file option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-info-file option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-info-file=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name to use for the file in which the slave records
+        information about the relay logs. The default name is
+        <filename>relay-log.info</filename> in the data directory.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-purge">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-purge option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-purge option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-purge={0|1}</option>
+      </para>
+
+      <para>
+        Disable or enable automatic purging of relay logs as soon as
+        they are no longer needed any more. The default value is 1
+        (enabled). This is a global variable that can be changed
+        dynamically with <literal>SET GLOBAL relay_log_purge =
+        <replaceable>N</replaceable></literal>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_relay-log-space-limit">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>relay-log-space-limit option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>relay-log-space-limit option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--relay-log-space-limit=<replaceable>size</replaceable></option>
+      </para>
+
+      <para>
+        This option places an upper limit on the total size in bytes of
+        all relay logs on the slave. A value of 0 means <quote>no
+        limit.</quote> This is useful for a slave server host that has
+        limited disk space. When the limit is reached, the I/O thread
+        stops reading binary log events from the master server until the
+        SQL thread has caught up and deleted some unused relay logs.
+        Note that this limit is not absolute: There are cases where the
+        SQL thread needs more events before it can delete relay logs. In
+        that case, the I/O thread exceeds the limit until it becomes
+        possible for the SQL thread to delete some relay logs, because
+        not doing so would cause a deadlock. You should not set
+        <option>--relay-log-space-limit</option> to less than twice the
+        value of <option>--max-relay-log-size</option> (or
+        <option>--max-binlog-size</option> if
+        <option>--max-relay-log-size</option> is 0). In that case, there
+        is a chance that the I/O thread waits for free space because
+        <option>--relay-log-space-limit</option> is exceeded, but the
+        SQL thread has no relay log to purge and is unable to satisfy
+        the I/O thread. This forces the I/O thread to temporarily ignore
+        <option>--relay-log-space-limit</option>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-do-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-do-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-do-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-do-db=<replaceable>db_name</replaceable></option>
+      </para>
+
+      <para>
+        The effects of this option depend on whether statement-based or
+        row-based replication is in use.
+      </para>
+
+      <formalpara>
+
+        <title>Statement-based replication</title>
+
+        <para>
+          Tell the slave to restrict replication to statements where the
+          default database (that is, the one selected by
+          <literal role="stmt">USE</literal>) is
+          <replaceable>db_name</replaceable>. To specify more than one
+          database, use this option multiple times, once for each
+          database. Note that this does not replicate cross-database
+          statements such as <literal>UPDATE
+          <replaceable>some_db.some_table</replaceable> SET
+          foo='bar'</literal> while having selected a different database
+          or no database.
+        </para>
+
+      </formalpara>
+
+      <warning>
+        <para>
+          To specify multiple databases you <emphasis>must</emphasis>
+          use multiple instances of this option. Because database names
+          can contain commas, if you supply a comma separated list then
+          the list will be treated as the name of a single database.
+        </para>
+      </warning>
+
+      <para>
+        An example of what does not work as you might expect when using
+        statement-based replication: If the slave is started with
+        <option>--replicate-do-db=sales</option> and you issue the
+        following statements on the master, the
+        <literal role="stmt">UPDATE</literal> statement is
+        <emphasis>not</emphasis> replicated:
+
+<programlisting>
+USE prices;
+UPDATE sales.january SET amount=amount+1000;
+</programlisting>
+
+        The main reason for this <quote>just check the default
+        database</quote> behavior is that it is difficult from the
+        statement alone to know whether it should be replicated (for
+        example, if you are using multiple-table
+        <literal role="stmt">DELETE</literal> statements or
+        multiple-table <literal role="stmt">UPDATE</literal> statements
+        that act across multiple databases). It is also faster to check
+        only the default database rather than all databases if there is
+        no need.
+      </para>
+
+      <formalpara>
+
+        <title>Row-based replication</title>
+
+        <para>
+          Tell the slave to restrict replication to database
+          <replaceable>db_name</replaceable>. Only tables belonging to
+          <replaceable>db_name</replaceable> are changed; the current
+          database has no effect on this. For example, suppose that the
+          slave is started with <option>--replicate-do-db=sales</option>
+          and row-based replication is in effect; then the following
+          statements are run on the master:
+
+<programlisting>
+USE prices;
+UPDATE sales.february SET amount=amount+100;
+</programlisting>
+
+          The <literal>february</literal> table in the
+          <literal>sales</literal> database on the slave is changed in
+          accordance with the <literal role="stmt">UPDATE</literal>
+          statement, and this takes place whether or not the
+          <literal role="stmt">USE</literal> statement was issued.
+          However, issuing the following statements on the master has no
+          effect on the slave when using row-based replication and
+          <option>--replicate-do-db=sales</option>:
+
+<programlisting>
+USE prices;
+UPDATE prices.march SET amount=amount-25;
+</programlisting>
+
+          Even if the statement <literal>USE prices</literal> were
+          changed to <literal>USE sales</literal>, the
+          <literal role="stmt">UPDATE</literal> statement&apos;s effects
+          would still not be replicated.
+        </para>
+
+      </formalpara>
+
+      <para>
+        Another importance difference in how
+        <option>--replicate-do-db</option> is handled in statement-based
+        replication as opposed to row-based replication occurs with
+        regard to statements that refer to multiple databases. Suppose
+        the slave is started with
+        <option>--replicate-do-db=db1</option>, and the following
+        statements are executed on the master:
+
+<programlisting>
+USE db1;
+UPDATE db1.table1 SET col1 = 10, db2.table2 SET col2 = 20;
+</programlisting>
+
+        If you are using statement-based replication, then both tables
+        are updated on the slave. However, when using row-based
+        replication, only <literal>table1</literal> is effected on the
+        slave; since <literal>table2</literal> is in a different
+        database, it is not changed by the
+        <literal role="stmt">UPDATE</literal>. Now suppose that, instead
+        of the <literal>USE db1</literal> statement, a <literal>USE
+        db4</literal> statement was used:
+
+<programlisting>
+USE db4;
+UPDATE db1.table1 SET col1 = 10, db2.table2 SET col2 = 20;
+</programlisting>
+
+        In this case, the <literal role="stmt">UPDATE</literal>
+        statement would have no effect on the slave when using
+        statement-based replication. However, if using row-based
+        replication, the <literal role="stmt">UPDATE</literal> would
+        change <literal>table1</literal> on the slave, but not
+        <literal>table2</literal> &mdash; in other words, only tables in
+        the database named by <option>--replicate-do-db</option> are
+        changed, and the choice of current database has no effect on
+        this behavior.
+      </para>
+
+      <para>
+        If you need cross-database updates to work, use
+        <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
+        instead. See <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-do-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-do-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-do-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tell the slave thread to restrict replication to the specified
+        table. To specify more than one table, use this option multiple
+        times, once for each table. This works for cross-database
+        updates, in contrast to <option>--replicate-do-db</option>. See
+        <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-ignore-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-ignore-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-ignore-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-ignore-db=<replaceable>db_name</replaceable></option>
+      </para>
+
+      <para>
+        As with <option>--replicate-do-db</option>, the effects of this
+        option depend on whether statement-based or row-based
+        replication is in use.
+      </para>
+
+      <formalpara>
+
+        <title>Statement-based replication</title>
+
+        <para>
+          Tells the slave to not replicate any statement where the
+          default database (that is, the one selected by
+          <literal role="stmt">USE</literal>) is
+          <replaceable>db_name</replaceable>.
+        </para>
+
+      </formalpara>
+
+      <formalpara>
+
+        <title>Row-based replication</title>
+
+        <para>
+          Tells the slave not to update any tables in the database
+          <replaceable>db_name</replaceable>. The current database has
+          no effect.
+        </para>
+
+      </formalpara>
+
+      <para>
+        When using statement-based replication, the following example
+        does not work as you might expect. Suppose that the slave is
+        started with <option>--replicate-ignore-db=sales</option> and
+        you issue the following statements on the master:
+
+<programlisting>
+USE prices;
+UPDATE sales.january SET amount=amount+1000;
+</programlisting>
+
+        The <literal role="stmt">UPDATE</literal> statement
+        <emphasis>is</emphasis> replicated in such a case because
+        <option>--replicate-ignore-db</option> applies only to the
+        default database (determined by the
+        <literal role="stmt">USE</literal> statement). Because the
+        <literal>sales</literal> database was specified explicitly in
+        the statement, the statement has not been filtered. However,
+        when using row-based replication, the
+        <literal role="stmt">UPDATE</literal> statement&apos;s effects
+        are <emphasis>not</emphasis> propagated to the slave, and the
+        slave&apos;s copy of the <literal>sales.january</literal> table
+        is unchanged; in this instance,
+        <option>--replicate-ignore-db=sales</option> causes
+        <emphasis>all</emphasis> changes made to tables in the
+        master&apos;s copy of the <literal>sales</literal> database to
+        be ignored by the slave.
+      </para>
+
+      <para>
+        To specify more than one database to ignore, use this option
+        multiple times, once for each database. Because database names
+        can contain commas, if you supply a comma separated list then
+        the list will be treated as the name of a single database.
+      </para>
+
+      <para>
+        You should not use this option if you are using cross-database
+        updates and you do not want these updates to be replicated. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        If you need cross-database updates to work, use
+        <option>--replicate-wild-ignore-table=<replaceable>db_name</replaceable>.%</option>
+        instead. See <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-ignore-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-ignore-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-ignore-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread to not replicate any statement that
+        updates the specified table, even if any other tables might be
+        updated by the same statement. To specify more than one table to
+        ignore, use this option multiple times, once for each table.
+        This works for cross-database updates, in contrast to
+        <option>--replicate-ignore-db</option>. See
+        <xref linkend="replication-rules"/>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-rewrite-db">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-rewrite-db option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-rewrite-db option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave to translate the default database (that is, the
+        one selected by <literal role="stmt">USE</literal>) to
+        <replaceable>to_name</replaceable> if it was
+        <replaceable>from_name</replaceable> on the master. Only
+        statements involving tables are affected (not statements such as
+        <literal role="stmt">CREATE DATABASE</literal>,
+        <literal role="stmt">DROP DATABASE</literal>, and
+        <literal role="stmt">ALTER DATABASE</literal>), and only if
+        <replaceable>from_name</replaceable> is the default database on
+        the master. This does not work for cross-database updates. To
+        specify multiple rewrites, use this option multiple times. The
+        server uses the first one with a
+        <replaceable>from_name</replaceable> value that matches. The
+        database name translation is done <emphasis>before</emphasis>
+        the <option>--replicate-*</option> rules are tested.
+      </para>
+
+      <para>
+        If you use this option on the command line and the
+        <quote><literal>&gt;</literal></quote> character is special to
+        your command interpreter, quote the option value. For example:
+      </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
+</programlisting>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-same-server-id">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-same-server-id option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-same-server-id option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-same-server-id</option>
+      </para>
+
+      <para>
+        To be used on slave servers. Usually you should use the default
+        setting of 0, to prevent infinite loops caused by circular
+        replication. If set to 1, the slave does not skip events having
+        its own server ID. Normally, this is useful only in rare
+        configurations. Cannot be set to 1 if
+        <option>--log-slave-updates</option> is used. Note that by
+        default the slave I/O thread does not even write binary log
+        events to the relay log if they have the slave's server ID (this
+        optimization helps save disk usage). So if you want to use
+        <option>--replicate-same-server-id</option>, be sure to start
+        the slave with this option before you make the slave read its
+        own events that you want the slave SQL thread to execute.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-wild-do-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-wild-do-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-wild-do-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread to restrict replication to statements
+        where any of the updated tables match the specified database and
+        table name patterns. Patterns can contain the
+        <quote><literal>%</literal></quote> and
+        <quote><literal>_</literal></quote> wildcard characters, which
+        have the same meaning as for the
+        <literal role="op">LIKE</literal> pattern-matching operator. To
+        specify more than one table, use this option multiple times,
+        once for each table. This works for cross-database updates. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        Example: <option>--replicate-wild-do-table=foo%.bar%</option>
+        replicates only updates that use a table where the database name
+        starts with <literal>foo</literal> and the table name starts
+        with <literal>bar</literal>.
+      </para>
+
+      <para>
+        If the table name pattern is <literal>%</literal>, it matches
+        any table name and the option also applies to database-level
+        statements (<literal role="stmt">CREATE DATABASE</literal>,
+        <literal role="stmt">DROP DATABASE</literal>, and
+        <literal role="stmt">ALTER DATABASE</literal>). For example, if
+        you use <option>--replicate-wild-do-table=foo%.%</option>,
+        database-level statements are replicated if the database name
+        matches the pattern <literal>foo%</literal>.
+      </para>
+
+      <para>
+        To include literal wildcard characters in the database or table
+        name patterns, escape them with a backslash. For example, to
+        replicate all tables of a database that is named
+        <literal>my_own%db</literal>, but not replicate tables from the
+        <literal>my1ownAABCdb</literal> database, you should escape the
+        <quote><literal>_</literal></quote> and
+        <quote><literal>%</literal></quote> characters like this:
+        <option>--replicate-wild-do-table=my\_own\%db</option>. If
+        you're using the option on the command line, you might need to
+        double the backslashes or quote the option value, depending on
+        your command interpreter. For example, with the
+        <command>bash</command> shell, you would need to type
+        <option>--replicate-wild-do-table=my\\_own\\%db</option>.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_replicate-wild-ignore-table">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>replicate-wild-ignore-table option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>replicate-wild-ignore-table option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
+      </para>
+
+      <para>
+        Tells the slave thread not to replicate a statement where any
+        table matches the given wildcard pattern. To specify more than
+        one table to ignore, use this option multiple times, once for
+        each table. This works for cross-database updates. See
+        <xref linkend="replication-rules"/>.
+      </para>
+
+      <para>
+        Example:
+        <option>--replicate-wild-ignore-table=foo%.bar%</option> does
+        not replicate updates that use a table where the database name
+        starts with <literal>foo</literal> and the table name starts
+        with <literal>bar</literal>.
+      </para>
+
+      <para>
+        For information about how matching works, see the description of
+        the <option>--replicate-wild-do-table</option> option. The rules
+        for including literal wildcard characters in the option value
+        are the same as for
+        <option>--replicate-wild-ignore-table</option> as well.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-host">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-host option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-host option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-host=<replaceable>host_name</replaceable></option>
+      </para>
+
+      <para>
+        The hostname or IP number of the slave to be reported to the
+        master during slave registration. This value appears in the
+        output of <literal role="stmt">SHOW SLAVE HOSTS</literal> on the
+        master server. Leave the value unset if you do not want the
+        slave to register itself with the master. Note that it is not
+        sufficient for the master to simply read the IP number of the
+        slave from the TCP/IP socket after the slave connects. Due to
+        NAT and other routing issues, that IP may not be valid for
+        connecting to the slave from the master or other hosts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <remark role="note">
+        Currently, this option is of no real interest; it is meant for
+        failover replication, which is not yet implemented.
+      </remark>
+
+      <para id="option_mysqld_report-port">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-port option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-port option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-port=<replaceable>slave_port_num</replaceable></option>
+      </para>
+
+      <para>
+        The TCP/IP port number for connecting to the slave, to be
+        reported to the master during slave registration. Set this only
+        if the slave is listening on a non-default port or if you have a
+        special tunnel from the master or other clients to the slave. If
+        you are not sure, do not use this option.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-password">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-password option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-password option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-password=<replaceable>password</replaceable></option>
+      </para>
+
+      <para>
+        The account password of the slave to be reported to the master
+        during slave registration. This value appears in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server if the <option>--show-slave-auth-info</option> option is
+        given.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_report-user">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>report-user option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>report-user option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--report-user=<replaceable>user_name</replaceable></option>
+      </para>
+
+      <para>
+        The account username of the slave to be reported to the master
+        during slave registration. This value appears in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server if the <option>--show-slave-auth-info</option> option is
+        given.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_show-slave-auth-info">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>show-slave-auth-info option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>show-slave-auth-info option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--show-slave-auth-info</option>
+      </para>
+
+      <para>
+        Display slave usernames and passwords in the output of
+        <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master
+        server for slaves started with the
+        <option>--report-user</option> and
+        <option>--report-password</option> options.
+      </para>
+    </listitem>
+
+    <listitem>
+      <remark role="note">
+        Currently, this option is of no real interest; it is meant for
+        failover replication, which is not yet implemented.
+      </remark>
+
+      <para id="option_mysqld_skip-slave-start">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>skip-slave-start option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>skip-slave-start option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--skip-slave-start</option>
+      </para>
+
+      <para>
+        Tells the slave server not to start the slave threads when the
+        server starts. To start the threads later, use a
+        <literal role="stmt">START SLAVE</literal> statement.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="sysvar_slave_compressed_protocol">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave_compressed_protocol option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave_compressed_protocol option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave_compressed_protocol={0|1}</option>
+      </para>
+
+      <para>
+        If this option is set to 1, use compression for the slave/master
+        protocol if both the slave and the master support it. The
+        default is 0 (no compression).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave-load-tmpdir">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-load-tmpdir option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-load-tmpdir option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
+      </para>
+
+      <para>
+        The name of the directory where the slave creates temporary
+        files. This option is by default equal to the value of the
+        <literal>tmpdir</literal> system variable. When the slave SQL
+        thread replicates a
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> statement, it extracts the file to be loaded
+        from the relay log into temporary files, and then loads these
+        into the table. If the file loaded on the master is huge, the
+        temporary files on the slave are huge, too. Therefore, it might
+        be advisable to use this option to tell the slave to put
+        temporary files in a directory located in some filesystem that
+        has a lot of available space. In that case, the relay logs are
+        huge as well, so you might also want to use the
+        <option>--relay-log</option> option to place the relay logs in
+        that filesystem.
+      </para>
+
+      <para>
+        The directory specified by this option should be located in a
+        disk-based filesystem (not a memory-based filesystem) because
+        the temporary files used to replicate
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> must survive machine restarts. The directory
+        also should not be one that is cleared by the operating system
+        during the system startup process.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave-net-timeout">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-net-timeout option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-net-timeout option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-net-timeout=<replaceable>seconds</replaceable></option>
+      </para>
+
+      <para>
+        The number of seconds to wait for more data from the master
+        before the slave considers the connection broken, aborts the
+        read, and tries to reconnect. The first retry occurs immediately
+        after the timeout. The interval between retries is controlled by
+        the <literal>MASTER_CONNECT_RETRY</literal> option for the
+        <literal role="stmt">CHANGE MASTER TO</literal> statement, and
+        the number of reconnection attempts is limited by the
+        <option>--master-retry-count</option> option. The default is
+        3600 seconds (one hour).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para id="option_mysqld_slave_skip_errors">
+        <indexterm>
+          <primary>mysqld</primary>
+          <secondary>slave-skip-errors option</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>slave-skip-errors option</primary>
+          <secondary>mysqld</secondary>
+        </indexterm>
+
+        <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
+      </para>
+
+      <para>
+        Normally, replication stops when an error occurs on the slave.
+        This gives you the opportunity to resolve the inconsistency in
+        the data manually. This option tells the slave SQL thread to
+        continue replication when a statement returns any of the errors
+        listed in the option value.
+      </para>
+
+      <para>
+        Do not use this option unless you fully understand why you are
+        getting errors. If there are no bugs in your replication setup
+        and client programs, and no bugs in MySQL itself, an error that
+        stops replication should never occur. Indiscriminate use of this
+        option results in slaves becoming hopelessly out of synchrony
+        with the master, with you having no idea why this has occurred.
+      </para>
+
+      <para>
+        For error codes, you should use the numbers provided by the
+        error message in your slave error log and in the output of
+        <literal role="stmt">SHOW SLAVE STATUS</literal>.
+        <xref linkend="error-handling"/>, lists server error codes.
+      </para>
+
+      <para>
+        You can also (but should not) use the very non-recommended value
+        of <literal>all</literal> to cause the slave to ignore all error
+        messages and keeps going regardless of what happens. Needless to
+        say, if you use <literal>all</literal>, there are no guarantees
+        regarding the integrity of your data. Please do not complain (or
+        file bug reports) in this case if the slave's data is not
+        anywhere close to what it is on the master. <emphasis>You have
+        been warned</emphasis>.
+      </para>
+
+      <para>
+        Examples:
+      </para>
+
+<programlisting>
+--slave-skip-errors=1062,1053
+--slave-skip-errors=all
+</programlisting>
+    </listitem>
+
+  </itemizedlist>
+
+  <remark role="todo">
+    Add here: Discuss replication-related system variables. sync_binlog.
+  </remark>
+
+  <section id="replication-options-table">
+
+    <title>Replication Option and Variable Reference</title>
+
+    <para>
+      The following table provides a list of the command-line options,
+      server and status variables applicable within
+      <literal>mysqld</literal> relating to replication and basic
+      information about each. <xref linkend="replication-options"/>,
+      provides more detailed information about these options and
+      variables.
+    </para>
+
+    <para>
+      For a table showing <emphasis>all</emphasis> command-line options,
+      server and status variables available for use with
+      <command>mysqld</command>, see
+      <xref linkend="mysqld-option-tables"/>.
+    </para>
+
+    <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-replication"/>
+
+  </section>
+
+</section>


Modified: trunk/refman-6.0/replication.xml
===================================================================
--- trunk/refman-6.0/replication.xml	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/refman-6.0/replication.xml	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 589 bytes

@@ -170,7 +170,7 @@
 
   </formalpara>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-replication-configuration.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-solutions.xml"/>
 


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 885 bytes

@@ -316,7 +316,8 @@
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 		../../refman-5.0/metadata/sql-syntax-transactions.idmap \
 		../../refman-5.0/metadata/stored-programs-views.idmap \
-	../../refman-5.1/metadata/replication-configuration-core.idmap \
+	../../refman-5.1/metadata/replication-configuration.idmap \
+	../../refman-5.1/metadata/replication-options-core-new.idmap \
 	../../refman-common/metadata/bug-reports.idmap
 mysql-replication-excerpt.validpure: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.titles: $(mysql_replication_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 7, Lines Added: 18, Lines Deleted: 9; 8715 bytes

@@ -42,7 +42,7 @@
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \
-		../../refman-5.1/metadata/replication-configuration-core.idmap \
+		../../refman-5.1/metadata/replication-configuration-new.idmap \
 		../../refman-5.1/metadata/replication-solutions.idmap \
 		../../refman-5.1/metadata/replication.idmap \
 		../../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \

@@ -142,7 +142,7 @@
 		../../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 		../../refman-5.1/metadata/mysql-cluster-security.idmap \
 		../../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
-		../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+		../../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 		../../refman-5.1/metadata/partitioning.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/replication-notes.idmap \

@@ -291,7 +291,7 @@
 		../../refman-5.1/metadata/internationalization.idmap \
 		../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 		../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-		../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+		../../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \

@@ -373,18 +373,24 @@
 mysql_replication_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/command-optvars/mysqld.xml \
-	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/legalnotice.en.xml \
+	../../refman-5.1/../common/fixedchars.ent \
+	../../refman-5.1/../common/phrases.ent \
+	../../refman-5.1/../dynamic-docs/command-optvars/mysqld.xml \
+	../../refman-5.1/../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.1/../refman-common/images/published/multi-db.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-after.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-before.png \
 	../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../../refman-5.1/../refman-common/images/published/scaleout.png \
 	../../refman-5.1/../refman-common/images/published/submaster-performance.png \
-	../../refman-5.1/replication-configuration-core.xml \
+	../../refman-5.1/../refman-common/urls.ent \
+	../../refman-5.1/all-entities.ent \
+	../../refman-5.1/dynxml-local-replication-options.xml \
+	../../refman-5.1/replication-configuration.xml \
 	../../refman-5.1/replication-implementation.xml \
 	../../refman-5.1/replication-notes.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../../refman-5.1/replication-solutions.xml \
 	../../refman-5.1/replication.xml \
 	../../refman-5.1/versions.ent \

@@ -410,14 +416,17 @@
 		../../refman-5.1/metadata/errors-problems-core.idmap \
 		../../refman-5.1/metadata/functions-core.idmap \
 		../../refman-5.1/metadata/information-schema.idmap \
+		../../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 		../../refman-5.1/metadata/mysql-cluster-replication.idmap \
 		../../refman-5.1/metadata/mysql-cluster.idmap \
 		../../refman-5.1/metadata/optimization.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \
-		../../refman-5.1/metadata/replication-configuration-core.idmap \
+		../../refman-5.1/metadata/replication-configuration-new.idmap \
 		../../refman-5.1/metadata/replication-implementation.idmap \
 		../../refman-5.1/metadata/replication-notes.idmap \
+		../../refman-5.1/metadata/replication-options-core-new.idmap \
+		../../refman-5.1/metadata/replication-options-core.idmap \
 		../../refman-5.1/metadata/replication-solutions.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
 		../../refman-5.1/metadata/se-memory.idmap \

@@ -475,7 +484,7 @@
 		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/programs.idmap \
-		../../refman-5.1/metadata/replication-configuration-core.idmap \
+		../../refman-5.1/metadata/replication-options-core-new.idmap \
 		../../refman-5.1/metadata/replication.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
 		../../refman-5.1/metadata/se-myisam-core.idmap \

@@ -680,7 +689,7 @@
 	$(RM) mysql-cluster-excerpt.xml mysql-cluster-excerpt-arbitrary.xml
 	$(MAKE) mysql-cluster-excerpt.xml
 
-mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication.all.preface.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml ../../refman-5.1/replication-configuration-core.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/replication-implementation.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.1/replication-notes!
 .xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/multi-db.png ../../refman-5.1/../refman-common/images/published/redundancy-after.png ../../refman-5.1/../refman-common/images/published/redundancy-before.png ../../refman-5.1/../refman-common/images/published/scaleout.png ../../refman-5.1/../refman-common/images/published/submaster-performance.png ../../refman-5.1/replication-solutions.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/replication.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent
+mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication.all.preface.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/../common/fixedchars.ent ../../refman-5.1/../common/phrases.ent ../../refman-5.1/../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.1/../dynamic-docs/metadata-titles.en.xml ../../refman-5.1/../refman-common/urls.ent ../../refman-5.1/all-entities.ent ../../refman-5.1/dynxml-local-replication-options.xml ../../refman-5.1/replication-configuration.xml ../../refman-5.1/replication-options-core.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.!
 1/replication-implementation.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.1/replication-notes.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/multi-db.png ../../refman-5.1/../refman-common/images/published/redundancy-after.png ../../refman-5.1/../refman-common/images/published/redundancy-before.png ../../refman-5.1/../refman-common/images/published/scaleout.png ../../refman-5.1/../refman-common/images/published/submaster-performance.png ../../refman-5.1/replication-solutions.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/replication.xml ../../refman-5.1/v!
 ersions.ent ../../refman-common/urls.ent all-entities.ent
 	$(RM) mysql-replication-excerpt.xml mysql-replication-excerpt-arbitrary.xml
 	$(MAKE) mysql-replication-excerpt.xml
 


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2008-11-29 03:28:54 UTC (rev 12708)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2008-11-29 12:49:09 UTC (rev 12709)
Changed blocks: 7, Lines Added: 15, Lines Deleted: 8; 9572 bytes

@@ -42,7 +42,7 @@
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \
-		../../refman-6.0/metadata/replication-configuration-core.idmap \
+		../../refman-6.0/metadata/replication-configuration.idmap \
 		../../refman-6.0/metadata/replication-solutions.idmap \
 		../../refman-6.0/metadata/replication.idmap \
 		../../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \

@@ -193,7 +193,7 @@
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 	../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-	../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../../refman-5.1/metadata/mysql-cluster-utilities-core.idmap \
 	../../refman-common/metadata/bug-reports.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)

@@ -271,9 +271,11 @@
 mysql_replication_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/command-optvars/mysqld.xml \
-	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/legalnotice.en.xml \
+	../../refman-6.0/../common/fixedchars.ent \
+	../../refman-6.0/../common/phrases.ent \
+	../../refman-6.0/../dynamic-docs/command-optvars/mysqld.xml \
+	../../refman-6.0/../dynamic-docs/metadata-titles.en.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 \

@@ -291,9 +293,13 @@
 	../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png \
 	../../refman-6.0/../refman-common/images/published/scaleout.png \
 	../../refman-6.0/../refman-common/images/published/submaster-performance.png \
-	../../refman-6.0/replication-configuration-core.xml \
+	../../refman-6.0/../refman-common/urls.ent \
+	../../refman-6.0/all-entities.ent \
+	../../refman-6.0/dynxml-local-replication-options.xml \
+	../../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 \

@@ -333,9 +339,10 @@
 		../../refman-6.0/metadata/optimization.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \
-		../../refman-6.0/metadata/replication-configuration-core.idmap \
+		../../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.idmap \

@@ -392,7 +399,7 @@
 		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/programs.idmap \
-		../../refman-6.0/metadata/replication-configuration-core.idmap \
+		../../refman-6.0/metadata/replication-options-core.idmap \
 		../../refman-6.0/metadata/replication.idmap \
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 		../../refman-6.0/metadata/se-myisam-core.idmap \

@@ -597,7 +604,7 @@
 	$(RM) mysql-solaris-excerpt.xml mysql-solaris-excerpt-arbitrary.xml
 	$(MAKE) mysql-solaris-excerpt.xml
 
-mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication.all.preface.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml ../../refman-6.0/replication-configuration-core.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/replication-implementation.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/replication-notes!
 .xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../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 ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png ../../refman-6.0/../r!
 efman-common/images/published/rpl-multi-master-linear-1.png ..!
 /../refm
an-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/replication.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
+mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication.all.preface.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/../common/fixedchars.ent ../../refman-6.0/../common/phrases.ent ../../refman-6.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/../dynamic-docs/metadata-titles.en.xml ../../refman-6.0/../refman-common/urls.ent ../../refman-6.0/all-entities.ent ../../refman-6.0/dynxml-local-replication-options.xml ../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-options-core.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.!
 0/replication-implementation.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/replication-notes.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../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 ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png ../../refman-6.0/../refman-common/images/published/r!
 pl-circular-upgrade-5.png ../../refman-6.0/../refman-common/im!
 ages/pub
lished/rpl-circular-upgrade-6.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-6.0/replication.xml ../../refman-6.0/versions.ent ../../refman-common/urls.ent all-entities.ent
 	$(RM) mysql-replication-excerpt.xml mysql-replication-excerpt-arbitrary.xml
 	$(MAKE) mysql-replication-excerpt.xml
 


Thread
svn commit - mysqldoc@docsrva: r12709 - in trunk: administrator guibook mysqlqb ndbapi refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 topic-guides/...jon29 Nov