| List: | Commits | « Previous MessageNext Message » | |
| From: | mcbrown | Date: | September 18 2006 1:10pm |
| Subject: | svn commit - mysqldoc@docsrva: r3387 - trunk/mysqld-optvars | ||
| View as plain text | |||
Author: mcbrown Date: 2006-09-18 13:10:15 +0200 (Mon, 18 Sep 2006) New Revision: 3387 Log: Removing some duplication of entries Modified: trunk/mysqld-optvars/options.xml Modified: trunk/mysqld-optvars/options.xml =================================================================== --- trunk/mysqld-optvars/options.xml 2006-09-18 10:31:47 UTC (rev 3386) +++ trunk/mysqld-optvars/options.xml 2006-09-18 11:10:15 UTC (rev 3387) Changed blocks: 30, Lines Added: 36, Lines Deleted: 346; 20534 bytes @@ -2835,6 +2835,7 @@ <optype class="cmdline" format="-a"/> <optype class="mycnf" format="ansi"/> </types> + <versions> <manual version="4.1"/> <manual version="5.0"/> @@ -3435,6 +3436,7 @@ <vartype class="server" format="character_set_filesystem" isdynamic="yes" /> </types> + <values vartype="string" platform="all"/> <versions> <manual version="5.0"/> <manual version="5.1"/> @@ -3513,23 +3515,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_filesystem"> - <name>character_set_client</name> - <shortdescription lang="en">Current filesystem character set</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="string" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="character_set_results"> <name>character_set_client</name> <shortdescription lang="en">Current result character set</shortdescription> @@ -3547,23 +3532,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="character_set_server"> - <name>character_set_client</name> - <shortdescription lang="en">Current server character set</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="string" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="chroot"> <name>chroot</name> <shortdescription lang="en">Chroot mysqld daemon during startup. @@ -4166,28 +4134,12 @@ <optype class="mycnf"/> <vartype class="server" format="event_scheduler" isdynamic="yes"/> </types> + <values vartype="boolean" platform="all"/> <versions> <manual version="5.1"/> <introduced version="5.1.6"/> </versions> </mysqloption> - <mysqloption id="event_scheduler"> - <name>event_scheduler</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="exit-info"> <name>exit-info</name> <shortdescription lang="en">Used for debugging; Use at your own risk!</shortdescription> @@ -5587,9 +5539,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--local-infile" setvar="local-infile"/> + <optype class="cmdline" format="--local-infile" setvar="local_infile"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="local_infile"/> </types> <values vartype="boolean" platform="all"> <value default="TRUE"/> @@ -5600,23 +5552,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="local_infile"> - <name>local_infile</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="log"> <name>log</name> <shortdescription lang="en">Log connections and queries to file</shortdescription> @@ -5687,9 +5622,10 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-bin-trust-function-creators" - setvar="log-bin-trust-function-creators"/> + setvar="log_bin_trust_function_creators"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" + format="log_bin_trust_function_creators"/> </types> <values vartype="boolean" platform="all"> <value default="FALSE"/> @@ -5811,9 +5747,10 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--log-queries-not-using-indexes" - setvar="log-queries-not-using-indexes"/> + setvar="log_queries_not_using_indexes"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" + format="log_queries_not_using_indexes"/> </types> <values vartype="boolean" platform="all"> <value default="FALSE"/> @@ -5982,10 +5919,10 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--log-warnings[=#]" setvar="log-warnings"/> - <optype class="cmdline" format="-W" setvar="log-warnings"/> - <optype class="mycnf" format="log-warnings" setvar="log-warnings"/> - <vartype isdynamic="yes" class="server"/> + <optype class="cmdline" format="--log-warnings[=#]" setvar="log_warnings"/> + <optype class="cmdline" format="-W" setvar="log_warnings"/> + <optype class="mycnf" format="log-warnings" setvar="log_warnings"/> + <vartype isdynamic="yes" class="server" format="log_warnings"/> </types> <values vartype="numeric" platform="all"> <value default="1"/> @@ -5996,57 +5933,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="log_bin_trust_function_creators"> - <name>log_bin_trust_function_creators</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="log_queries_not_using_indexes"> - <name>log_queries_not_using_indexes</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="log_warnings"> - <name>log_warnings</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="long_query_time"> <name>long_query_time</name> <shortdescription lang="en">Log all queries that have taken more than @@ -6080,9 +5966,9 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--low-priority-updates" - setvar="low-priority-updates"/> + setvar="low_priority_updates"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="low_priority_updates"/> </types> <values vartype="numeric" platform="all"> <value default="FALSE"/> @@ -6093,23 +5979,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="low_priority_updates"> - <name>low_priority_updates</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="lower_case_table_names"> <name>lower_case_table_names</name> <shortdescription lang="en">If set to 1 table names are stored in lowercase @@ -7216,36 +7085,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ndb-extra-logging"> - <name>ndb-extra-logging</name> - <shortdescription lang="en">NDB Extra Logging</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype isdynamic="yes" class="server"/> - </types> - <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="ndb-force-send"> - <name>ndb-force-send</name> - <shortdescription lang="en">Force send of buffers to ndb immediately without - waiting for other threads</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <optype class="cmdline" format="--ndb-force-send"/> - </types> - <versions> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="ndb-index-stat-cache-entries"> <name>ndb-index-stat-cache-entries</name> <shortdescription lang="en">NDB Index Stat Cache Entries</shortdescription> @@ -7406,21 +7245,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="ndb-use-exact-count"> - <name>ndb-use-exact-count</name> - <shortdescription lang="en">NDB Use Exact Count</shortdescription> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype isdynamic="yes" class="server"/> - </types> - <versions> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="ndb_extra_logging"> <name>ndb_extra_logging</name> <shortdescription lang=""/> @@ -7651,9 +7475,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--old-passwords" setvar="old-passwords"/> + <optype class="cmdline" format="--old-passwords" setvar="old_passwords"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="old_passwords"/> </types> <values vartype="boolean" platform="all"> <value default="FALSE"/> @@ -7686,23 +7510,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="old_passwords"> - <name>old_passwords</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="open_files_limit"> <name>open_files_limit</name> <shortdescription lang="en">If this is not 0, then mysqld will use this @@ -8506,9 +8313,9 @@ <platforms applies="all"/> <types> <optype class="cmdline" format="--rpl-recovery-rank=#" - setvar="rpl-recovery-rank"/> + setvar="rpl_recovery_rank"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="rpl_recovery_rank"/> </types> <values vartype="numeric" platform="all"> <value default="0"/> @@ -8519,31 +8326,15 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="rpl_recovery_rank"> - <name>rpl_recovery_rank</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> + <mysqloption id="safe-mode"> <name>safe-mode</name> - <shortdescription lang="en">Skip some optimize stages (for testing). - --safe-show-database Deprecated option; use GRANT SHOW DATABASES instead..</shortdescription> + <shortdescription lang="en">Skip some optimize stages (for testing)</shortdescription> <section id="mysqld"/> <opclass class="server"/> <engines includes="all"/> <platforms applies="all"/> + <deprecated version="5.0"/> <types> <optype class="cmdline" format="--safe-mode"/> <optype class="mycnf"/> @@ -8564,8 +8355,9 @@ <platforms applies="all"/> <deprecated version="5.0"/> <types> - <optype class="cmdline" format="--safe-show-database"/> + <optype class="cmdline" format="--safe-show-database" setvar="safe_show_database"/> <optype class="mycnf"/> + <vartype class="server" isdynamic="yes" type="global" format="safe_show_database"/> </types> <versions> <manual version="4.1"/> @@ -8596,23 +8388,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="safe_show_database"> - <name>safe_show_database</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="safemalloc-mem-limit"> <name>safemalloc-mem-limit</name> <shortdescription lang="en">Simulate memory shortage </shortdescription> @@ -8639,9 +8414,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--secure-auth" setvar="secure-auth"/> + <optype class="cmdline" format="--secure-auth" setvar="secure_auth"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="secure_auth"/> </types> <values vartype="boolean" platform="all"> <value default="FALSE"/> @@ -8652,23 +8427,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="secure_auth"> - <name>secure_auth</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="server-id"> <name>server-id</name> <shortdescription lang="en">Uniquely identifies the server instance in the @@ -8678,9 +8436,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--server-id=#" setvar="server-id"/> + <optype class="cmdline" format="--server-id=#" setvar="server_id"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="server_id"/> </types> <values vartype="numeric" platform="all"> <value default="0"/> @@ -8691,23 +8449,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="server_id"> - <name>server_id</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="set-variable"> <name>set-variable</name> <shortdescription lang="en">Change the value of a variable. Please note that @@ -9425,9 +9166,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sql-mode=name" setvar="sql-mode"/> + <optype class="cmdline" format="--sql-mode=name" setvar="sql_mode"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="sql_mode"/> </types> <values vartype="enumeration" platform="all"> <choice value="REAL_AS_FLOAT"/> @@ -9598,23 +9339,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sql_mode"> - <name>sql_mode</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="both"/> - </types> - <values vartype="enumeration" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="sql_notes"> <name>sql_notes</name> <shortdescription lang=""/> @@ -9901,9 +9625,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sync-binlog=#" setvar="sync-binlog"/> + <optype class="cmdline" format="--sync-binlog=#" setvar="sync_binlog"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="sync_binlog"/> </types> <values vartype="numeric" platform="all"> <value default="0"/> @@ -9922,9 +9646,9 @@ <engines includes="all"/> <platforms applies="all"/> <types> - <optype class="cmdline" format="--sync-frm" setvar="sync-frm"/> + <optype class="cmdline" format="--sync-frm" setvar="sync_frm"/> <optype class="mycnf"/> - <vartype isdynamic="yes" class="server"/> + <vartype isdynamic="yes" class="server" format="sync_frm"/> </types> <values vartype="boolean" platform="all"> <value default="TRUE"/> @@ -9935,40 +9659,6 @@ <manual version="5.1"/> </versions> </mysqloption> - <mysqloption id="sync_binlog"> - <name>sync_binlog</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="numeric" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> - <mysqloption id="sync_frm"> - <name>sync_frm</name> - <shortdescription lang=""/> - <section id="mysqld"/> - <opclass class="server"/> - <engines includes="all"/> - <platforms applies="all"/> - <types> - <vartype class="server" isdynamic="yes" type="global"/> - </types> - <values vartype="boolean" platform="all"/> - <versions> - <manual version="4.1"/> - <manual version="5.0"/> - <manual version="5.1"/> - </versions> - </mysqloption> <mysqloption id="sysdate-is-now"> <name>sysdate-is-now</name> <shortdescription lang="en">Non-default option to alias SYSDATE() to NOW()
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r3387 - trunk/mysqld-optvars | mcbrown | 18 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.700 sec. using MySQL 5.1.14-beta-log