| List: | Internals | « Previous MessageNext Message » | |
| From: | paul | Date: | August 8 2005 9:48pm |
| Subject: | bk commit - mysqldoc@docsrva tree (paul:1.3208) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local mysqldoc repository of paul. When paul does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet 1.3208 05/08/08 14:48:06 paul@stripped +4 -0 Replace tags. refman/sql-syntax.xml 1.34 05/08/08 14:48:04 paul@stripped +69 -69 Replace tags. refman-5.1/sql-syntax.xml 1.3 05/08/08 14:48:04 paul@stripped +63 -65 Replace tags. refman-5.0/sql-syntax.xml 1.5 05/08/08 14:48:04 paul@stripped +72 -72 Replace tags. refman-4.1/sql-syntax.xml 1.28 05/08/08 14:48:04 paul@stripped +60 -60 Replace tags. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: paul # Host: kite-hub.kitebird.com # Root: /src/extern/MySQL/bk/mysqldoc --- 1.2/refman-5.1/sql-syntax.xml 2005-08-05 16:04:20 -05:00 +++ 1.3/refman-5.1/sql-syntax.xml 2005-08-08 14:48:04 -05:00 @@ -832,9 +832,9 @@ AUTO_INCREMENT=<replaceable>value</replaceable></literal> table option for <literal>InnoDB</literal> tables to set the sequence number for new rows if the value is greater than the maximum - value in the <literal>AUTO_INCREMENT</literal> column. - <emphasis>If the value is less than the current maximum value in - the column, no error message is given and the current sequence + value in the <literal>AUTO_INCREMENT</literal> column. + <emphasis>If the value is less than the current maximum value in + the column, no error message is given and the current sequence value is not changed.</emphasis> </para> @@ -1412,7 +1412,7 @@ <para> In MySQL 5.0, specifying the <literal>NO_AUTO_VALUE_ON_ZERO</literal> flag for the - <literal>--sql-mode</literal> server option or the + <option>--sql-mode</option> server option or the <literal>sql_mode</literal> system variable allows you to store <literal>0</literal> in <literal>AUTO_INCREMENT</literal> columns as @@ -1966,9 +1966,9 @@ <listitem> <para> - For <literal>MyISAM</literal> tables, each - <literal>NULL</literal> column takes one bit extra, rounded - up to the nearest byte. The maximum record length in bytes + For <literal>MyISAM</literal> tables, each + <literal>NULL</literal> column takes one bit extra, rounded + up to the nearest byte. The maximum record length in bytes can be calculated as follows: </para> @@ -2450,7 +2450,7 @@ <para> These options work only when you are not using the - <literal>--skip-symbolic-links</literal> option. Your + <option>--skip-symbolic-links</option> option. Your operating system must also have a working, thread-safe <literal>realpath()</literal> call. See <xref linkend="symbolic-links-to-tables"/> for more complete @@ -3964,9 +3964,9 @@ <para> If you specify <literal>HIGH_PRIORITY</literal>, it overrides the effect of the - <literal>--low-priority-updates</literal> option if the - server was started with that option. It also causes - concurrent inserts not to be used. + <option>--low-priority-updates</option> option if the server + was started with that option. It also causes concurrent + inserts not to be used. </para> </listitem> @@ -4689,9 +4689,9 @@ You can also load data files by using the <command>mysqlimport</command> utility; it operates by sending a <literal>LOAD DATA INFILE</literal> statement to the server. The - <literal>--local</literal> option causes + <option>--local</option> option causes <command>mysqlimport</command> to read data files from the - client host. You can specify the <literal>--compress</literal> + client host. You can specify the <option>--compress</option> option to get better performance over slow networks if the client and server support the compressed protocol. See <xref linkend="mysqlimport"/>. @@ -4824,9 +4824,8 @@ In MySQL 5.0, <literal>LOCAL</literal> works only if your server and your client both have been enabled to allow it. For example, if <command>mysqld</command> was started with - <literal>--local-infile=0</literal>, then - <literal>LOCAL</literal> does not work. See - <xref linkend="load-data-local"/>. + <option>--local-infile=0</option>, then <literal>LOCAL</literal> + does not work. See <xref linkend="load-data-local"/>. </para> <para> @@ -6325,7 +6324,7 @@ The <literal>LIMIT</literal> clause can be used to constrain the number of rows returned by the <literal>SELECT</literal> statement. <literal>LIMIT</literal> takes one or two numeric - arguments, which must both be non-negative integer + arguments, which must both be non-negative integer constants. </para> @@ -9710,7 +9709,7 @@ <para> You can set the initial default global isolation level for <command>mysqld</command> with the - <literal>--transaction-isolation</literal> option. See + <option>--transaction-isolation</option> option. See <xref linkend="server-options"/>. </para> @@ -10392,14 +10391,14 @@ database-level statement, so none of the global-only privileges such as <literal>FILE</literal> are granted. </para> - + <para> - MySQL allows you to grant privileges even on database objects - that do not exist. In such cases, the privileges to be granted - must include the <literal>CREATE</literal> privilege. - <emphasis>This behaviour is by design</emphasis>, and is - intended to allow the database administrator to prepare user - accounts and privileges for database objects that are to be + MySQL allows you to grant privileges even on database objects + that do not exist. In such cases, the privileges to be granted + must include the <literal>CREATE</literal> privilege. + <emphasis>This behaviour is by design</emphasis>, and is + intended to allow the database administrator to prepare user + accounts and privileges for database objects that are to be created at a later time. </para> @@ -10636,7 +10635,7 @@ DATABASE</literal> statement. Accounts that do not have this privilege see only databases for which they have some privileges, and cannot use the statement at all if the server - was started with the <literal>--skip-show-database</literal> + was started with the <option>--skip-show-database</option> option. </para> @@ -11707,10 +11706,9 @@ <para> You can get <literal>OPTIMIZE TABLE</literal> to work on other table types by starting <command>mysqld</command> with the - <literal>--skip-new</literal> or - <literal>--safe-mode</literal> option; in this case, - <literal>OPTIMIZE TABLE</literal> is just mapped to - <literal>ALTER TABLE</literal>. + <option>--skip-new</option> or <option>--safe-mode</option> + option; in this case, <literal>OPTIMIZE TABLE</literal> is + just mapped to <literal>ALTER TABLE</literal>. </para> <para> @@ -12465,7 +12463,7 @@ </para> <para> - This variable is deprecated, and is mapped to + This variable is deprecated, and is mapped to <literal>SQL_LOG_BIN</literal>. </para> </listitem> @@ -13041,7 +13039,7 @@ <para> If the server was started with the - <literal>--skip-show-database</literal> option, you cannot use + <option>--skip-show-database</option> option, you cannot use this statement at all unless you have the <literal>SHOW DATABASES</literal> privilege. </para> @@ -13252,8 +13250,8 @@ A <literal>Support</literal> value indicates whether the particular storage engine is supported, and which is the default engine. For example, if the server is started with the - <literal>--default-table-type=InnoDB</literal> option, then - the <literal>Support</literal> value for the + <option>--default-table-type=InnoDB</option> option, then the + <literal>Support</literal> value for the <literal>InnoDB</literal> row has the value <literal>DEFAULT</literal>. </para> @@ -14134,7 +14132,7 @@ the table. If you are not using multiple <command>mysqld</command> servers that are accessing the same tables, you can disable system locks with the - <literal>--skip-external-locking</literal> option. + <option>--skip-external-locking</option> option. </para> </listitem> @@ -14737,9 +14735,9 @@ <listitem> <para> <literal>Statement</literal>: The statement to be - executed when the trigger is invoked. This is the same - as the text shown in the - <literal>ACTION_STATEMENT</literal> column of + executed when the trigger is invoked. This is the same + as the text shown in the + <literal>ACTION_STATEMENT</literal> column of <literal>INFORMATION_SCHEMA.TRIGGERS</literal>. </para> </listitem> @@ -15278,7 +15276,7 @@ the host tables allows the host to attempt to connect again. See <xref linkend="blocked-host"/>. You can start <command>mysqld</command> with - <literal>--max_connect_errors=999999999</literal> to avoid + <option>--max_connect_errors=999999999</option> to avoid this error message. </para> </listitem> @@ -15290,7 +15288,7 @@ <para> Reloads the DES keys from the file that was specified with - the <literal>--des-key-file</literal> option at server + the <option>--des-key-file</option> option at server startup time. </para> </listitem> @@ -16056,7 +16054,7 @@ <para> Displays a list of replication slaves currently registered with the master. Any slave not started with the - <literal>--report-host=<replaceable>slave_name</replaceable></literal> + <option>--report-host=<replaceable>slave_name</replaceable></option> option is not visible in this list. <!-- end_description_for_help_topic --> @@ -16286,11 +16284,11 @@ accidentally have the server purge the binary logs. In MySQL 5.0, use <literal>SET GLOBAL relay_log_purge=0</literal> for additional safety. Then start the server without the - <literal>--log-bin</literal> option, Instead, use the - <literal>--replicate-same-server-id</literal>, - <literal>--relay-log=myhost-bin</literal> (to make the server + <option>--log-bin</option> option, Instead, use the + <option>--replicate-same-server-id</option>, + <option>--relay-log=myhost-bin</option> (to make the server believe that these regular binary logs are relay logs), - <literal>--skip-slave-start</literal> options. Once the server + <option>--skip-slave-start</option> options. Once the server starts, issue these statements: </para> @@ -16341,13 +16339,13 @@ <literal>MASTER_LOG_POS</literal> so that the slave starts replicating from the correct position. Any table and database exclusion rules specified with the - <literal>--replicate-*-do-*</literal> and - <literal>--replicate-*-ignore-*</literal> options are honored. - <literal>--replicate-rewrite-db</literal> is + <option>--replicate-*-do-*</option> and + <option>--replicate-*-ignore-*</option> options are honored. + <option>--replicate-rewrite-db</option> is <emphasis>not</emphasis> taken into account. This is because a user could, with this option, set up a non-unique mapping such - as <literal>--replicate-rewrite-db=db1->db3</literal> and - <literal>--replicate-rewrite-db=db2->db3</literal>, which + as <option>--replicate-rewrite-db=db1->db3</option> and + <option>--replicate-rewrite-db=db2->db3</option>, which would confuse the slave when loading tables from the master. </para> @@ -16690,7 +16688,7 @@ <para> The current value of the - <literal>--master-connect-retry</literal> option. + <option>--master-connect-retry</option> option. </para> </listitem> @@ -16776,8 +16774,8 @@ <para> The lists of databases that were specified with the - <literal>--replicate-do-db</literal> and - <literal>--replicate-ignore-db</literal> options, if any. + <option>--replicate-do-db</option> and + <option>--replicate-ignore-db</option> options, if any. </para> </listitem> @@ -16790,11 +16788,11 @@ <para> The lists of tables that were specified with the - <literal>--replicate-do-table</literal>, - <literal>--replicate-ignore-table</literal>, - <literal>--replicate-wild-do-table</literal>, and - <literal>--replicate-wild-ignore_table</literal> options, - if any. + <option>--replicate-do-table</option>, + <option>--replicate-ignore-table</option>, + <option>--replicate-wild-do-table</option>, and + <option>--replicate-wild-ignore_table</option> options, if + any. </para> </listitem> @@ -16960,11 +16958,11 @@ <para> The values of the other SSL-related fields correspond to - the values of the <literal>--master-ca</literal>, - <literal>--master-capath</literal>, - <literal>--master-cert</literal>, - <literal>--master-cipher</literal>, and - <literal>--master-key</literal> options. + the values of the <option>--master-ca</option>, + <option>--master-capath</option>, + <option>--master-cert</option>, + <option>--master-cipher</option>, and + <option>--master-key</option> options. </para> </listitem> @@ -17129,8 +17127,8 @@ If you are using <literal>UNTIL</literal> to have the slave process replicated queries in sections, it is recommended that you start the slave with the - <literal>--skip-slave-start</literal> option to prevent the - SQL thread from running when the slave server starts. It is + <option>--skip-slave-start</option> option to prevent the SQL + thread from running when the slave server starts. It is probably best to use this option in an option file rather than on the command line, so that an unexpected server restart does not cause it to be forgotten. --- 1.27/refman-4.1/sql-syntax.xml 2005-08-08 12:31:33 -05:00 +++ 1.28/refman-4.1/sql-syntax.xml 2005-08-08 14:48:04 -05:00 @@ -684,7 +684,7 @@ changes the default character set, but <literal>ALTER TABLE ... CHARACTER SET</literal> (without <literal>DEFAULT</literal>) changes the default character - set <emphasis>and also converts all columns to the new + set <emphasis>and also converts all columns to the new character set</emphasis>. </para> </listitem> @@ -839,9 +839,9 @@ AUTO_INCREMENT=<replaceable>value</replaceable></literal> table option for <literal>InnoDB</literal> tables to set the sequence number for new rows if the value is greater than the maximum - value in the <literal>AUTO_INCREMENT</literal> column. - <emphasis>If the value is less than the current maximum value in - the column, no error message is given and the current sequence + value in the <literal>AUTO_INCREMENT</literal> column. + <emphasis>If the value is less than the current maximum value in + the column, no error message is given and the current sequence value is not changed.</emphasis> </para> @@ -1106,21 +1106,21 @@ </programlisting> <para> - <literal>TYPE <replaceable>type_name</replaceable></literal> can - be used as a synonym for - <literal>USING <replaceable>type_name</replaceable></literal> to - specify an index type. However, <literal>USING</literal> is the - preferred form. Also, the index name that precedes the index - type in the index specification syntax is not optional with + <literal>TYPE <replaceable>type_name</replaceable></literal> can + be used as a synonym for <literal>USING + <replaceable>type_name</replaceable></literal> to specify an + index type. However, <literal>USING</literal> is the preferred + form. Also, the index name that precedes the index type in the + index specification syntax is not optional with <literal>TYPE</literal>. This is because, unlike <literal>USING</literal>, <literal>TYPE</literal> is not a reserved word and thus is interpreted as an index name. </para> <para> - If you specify an index type that is not legal for a given - storage engine, but there is another index type available that - the engine can use without affecting query results, the engine + If you specify an index type that is not legal for a given + storage engine, but there is another index type available that + the engine can use without affecting query results, the engine uses the available type. </para> @@ -1523,8 +1523,8 @@ </para> <para> - If a column definition includes no explicit - <literal>DEFAULT</literal> value, MySQL determines the + If a column definition includes no explicit + <literal>DEFAULT</literal> value, MySQL determines the default value as follows: </para> @@ -1580,7 +1580,7 @@ <literal>BLOB</literal> and <literal>TEXT</literal> columns cannot be assigned a default value. </para> - + <para> For a given table, you can use the <literal>SHOW CREATE TABLE</literal> statement to see which columns have an @@ -2609,8 +2609,8 @@ <listitem> <para> - From MySQL 4.1.0 onwards, a <literal>CHAR</literal> or - <literal>VARCHAR</literal> column with a length + From MySQL 4.1.0 onwards, a <literal>CHAR</literal> or + <literal>VARCHAR</literal> column with a length specification greater than 255 is converted to the smallest <literal>TEXT</literal> type that can hold values of the given length. For example, @@ -3967,10 +3967,10 @@ <para> If you specify the <literal>HIGH_PRIORITY</literal> keyword, it overrides the effect of the - <option>--low-priority-updates</option> option if the - server was started with that option. It also causes - concurrent inserts not to be used. - <literal>HIGH_PRIORITY</literal> was added in MySQL 3.23.11. + <option>--low-priority-updates</option> option if the server + was started with that option. It also causes concurrent + inserts not to be used. <literal>HIGH_PRIORITY</literal> was + added in MySQL 3.23.11. </para> </listitem> @@ -4355,9 +4355,9 @@ The <literal>DELAYED</literal> option for the <literal>INSERT</literal> statement is a MySQL extension to standard SQL that is very useful if you have clients that - cannot wait for the <literal>INSERT</literal> to complete. This - is a common problem when you use MySQL for logging and you - also periodically run <literal>SELECT</literal> and + cannot wait for the <literal>INSERT</literal> to complete. + This is a common problem when you use MySQL for logging and + you also periodically run <literal>SELECT</literal> and <literal>UPDATE</literal> statements that take a long time to complete. <literal>DELAYED</literal> was introduced in MySQL 3.22.15. @@ -4840,8 +4840,8 @@ <literal>LOCAL</literal> works only if your server and your client both have been enabled to allow it. For example, if <command>mysqld</command> was started with - <option>--local-infile=0</option>, <literal>LOCAL</literal> - does not work. See <xref linkend="load-data-local"/>. + <option>--local-infile=0</option>, <literal>LOCAL</literal> does + not work. See <xref linkend="load-data-local"/>. </para> <para> @@ -6264,7 +6264,7 @@ The <literal>LIMIT</literal> clause can be used to constrain the number of rows returned by the <literal>SELECT</literal> statement. <literal>LIMIT</literal> takes one or two numeric - arguments, which must both be non-negative integer + arguments, which must both be non-negative integer constants. </para> @@ -6413,8 +6413,8 @@ </para> <para> - The resulting file does not have to conform to SQL syntax, so - nothing else need be escaped. + The resulting file does not have to conform to SQL syntax, + so nothing else need be escaped. </para> <para> @@ -7736,8 +7736,8 @@ with <literal>SELECT *</literal>, but it could begin with <literal>SELECT 5</literal> or <literal>SELECT column1</literal> or anything at all. MySQL ignores the - <literal>SELECT</literal> list in such a subquery, so it - does not matter. + <literal>SELECT</literal> list in such a subquery, so it does + not matter. </para> <para> @@ -7952,7 +7952,8 @@ <para> Here's another example: Suppose that you want to know the - average of a set of sums for a grouped table. This will not work: + average of a set of sums for a grouped table. This will not + work: </para> <programlisting> @@ -10449,14 +10450,14 @@ database-level statement, so none of the global-only privileges such as <literal>FILE</literal> are granted. </para> - + <para> - MySQL allows you to grant privileges even on database objects - that do not exist. In such cases, the privileges to be granted - must include the <literal>CREATE</literal> privilege. - <emphasis>This behaviour is by design</emphasis>, and is - intended to allow the database administrator to prepare user - accounts and privileges for database objects that are to be + MySQL allows you to grant privileges even on database objects + that do not exist. In such cases, the privileges to be granted + must include the <literal>CREATE</literal> privilege. + <emphasis>This behaviour is by design</emphasis>, and is + intended to allow the database administrator to prepare user + accounts and privileges for database objects that are to be created at a later time. </para> @@ -10595,9 +10596,9 @@ <para> In most cases, you grant rights to a user at only one of the - privilege levels, so life is not normally this complicated. The - details of the privilege-checking procedure are presented in - <xref linkend="privilege-system"/>. + privilege levels, so life is not normally this complicated. + The details of the privilege-checking procedure are presented + in <xref linkend="privilege-system"/>. </para> <para> @@ -11574,8 +11575,8 @@ </para> <para> - Some problems reported by <literal>CHECK TABLE</literal> cannot - be corrected automatically: + Some problems reported by <literal>CHECK TABLE</literal> + cannot be corrected automatically: </para> <itemizedlist> @@ -11768,10 +11769,9 @@ <para> You can get <literal>OPTIMIZE TABLE</literal> to work on other table types by starting <command>mysqld</command> with the - <option>--skip-new</option> or - <option>--safe-mode</option> option; in this case, - <literal>OPTIMIZE TABLE</literal> is just mapped to - <literal>ALTER TABLE</literal>. + <option>--skip-new</option> or <option>--safe-mode</option> + option; in this case, <literal>OPTIMIZE TABLE</literal> is + just mapped to <literal>ALTER TABLE</literal>. </para> <para> @@ -13369,8 +13369,8 @@ A <literal>Support</literal> value indicates whether the particular storage engine is supported, and which is the default engine. For example, if the server is started with the - <option>--default-table-type=InnoDB</option> option, then - the <literal>Support</literal> value for the + <option>--default-table-type=InnoDB</option> option, then the + <literal>Support</literal> value for the <literal>InnoDB</literal> row has the value <literal>DEFAULT</literal>. </para> @@ -16319,14 +16319,14 @@ the server purge the binary logs. If using MySQL 4.1.1 or newer, use <literal>SET GLOBAL relay_log_purge=0</literal> for additional safety. Then start the server without the - <option>--log-bin</option> option. Before MySQL 4.0.19, - start it with a new (different from before) server id; in - newer versions there is no need, just use the + <option>--log-bin</option> option. Before MySQL 4.0.19, start + it with a new (different from before) server id; in newer + versions there is no need, just use the <option>--replicate-same-server-id</option> option. Start it with <option>--relay-log=myhost-bin</option> (to make the server believe that these regular binary logs are relay logs) - and with <option>--skip-slave-start</option>. After the - server starts, issue these statements: + and with <option>--skip-slave-start</option>. After the server + starts, issue these statements: </para> <programlisting> @@ -16851,8 +16851,8 @@ <option>--replicate-do-table</option>, <option>--replicate-ignore-table</option>, <option>--replicate-wild-do-table</option>, and - <option>--replicate-wild-ignore_table</option> options, - if any. + <option>--replicate-wild-ignore_table</option> options, if + any. </para> <para> @@ -17205,8 +17205,8 @@ If you are using <literal>UNTIL</literal> to have the slave process replicated queries in sections, it is recommended that you start the slave with the - <option>--skip-slave-start</option> option to prevent the - SQL thread from running when the slave server starts. It is + <option>--skip-slave-start</option> option to prevent the SQL + thread from running when the slave server starts. It is probably best to use this option in an option file rather than on the command line, so that an unexpected server restart does not cause it to be forgotten. --- 1.33/refman/sql-syntax.xml 2005-08-06 00:00:25 -05:00 +++ 1.34/refman/sql-syntax.xml 2005-08-08 14:48:04 -05:00 @@ -850,13 +850,14 @@ </para> <para> - From MySQL 4.1.12 and MySQL 5.0.3, you can use the - <literal>ALTER TABLE ... AUTO_INCREMENT=<replaceable>value</replaceable></literal> - table option for <literal>InnoDB</literal> tables to set the - sequence number for new rows if the value is greater than the - maximum value in the <literal>AUTO_INCREMENT</literal> column. - <emphasis>If the value is less than the current maximum value in - the column, no error message is given and the current sequence + From MySQL 4.1.12 and MySQL 5.0.3, you can use the + <literal>ALTER TABLE ... + AUTO_INCREMENT=<replaceable>value</replaceable></literal> table + option for <literal>InnoDB</literal> tables to set the sequence + number for new rows if the value is greater than the maximum + value in the <literal>AUTO_INCREMENT</literal> column. + <emphasis>If the value is less than the current maximum value in + the column, no error message is given and the current sequence value is not changed.</emphasis> </para> @@ -1422,7 +1423,7 @@ <para> As of MySQL 4.1.1, specifying the <literal>NO_AUTO_VALUE_ON_ZERO</literal> flag for the - <literal>--sql-mode</literal> server option or the + <option>--sql-mode</option> server option or the <literal>sql_mode</literal> system variable allows you to store <literal>0</literal> in <literal>AUTO_INCREMENT</literal> columns as @@ -2461,7 +2462,7 @@ <para> <literal>RAID_TYPE</literal> works on any operating system, as long as you have built MySQL with the - <literal>--with-raid</literal> option to + <option>--with-raid</option> option to <command>configure</command>. To determine whether a server supports <literal>RAID</literal> tables, use <literal>SHOW VARIABLES LIKE 'have_raid'</literal> to see whether the @@ -2531,7 +2532,7 @@ <para> These options work only for <literal>MyISAM</literal> tables from MySQL 4.0 on, when you are not using the - <literal>--skip-symbolic-links</literal> option. Your + <option>--skip-symbolic-links</option> option. Your operating system must also have a working, thread-safe <literal>realpath()</literal> call. See <xref linkend="symbolic-links-to-tables"/>. @@ -4131,10 +4132,10 @@ <para> If you specify the <literal>HIGH_PRIORITY</literal> keyword, it overrides the effect of the - <literal>--low-priority-updates</literal> option if the - server was started with that option. It also causes - concurrent inserts not to be used. - <literal>HIGH_PRIORITY</literal> was added in MySQL 3.23.11. + <option>--low-priority-updates</option> option if the server + was started with that option. It also causes concurrent + inserts not to be used. <literal>HIGH_PRIORITY</literal> was + added in MySQL 3.23.11. </para> </listitem> @@ -4865,9 +4866,9 @@ You can also load data files by using the <command>mysqlimport</command> utility; it operates by sending a <literal>LOAD DATA INFILE</literal> statement to the server. The - <literal>--local</literal> option causes + <option>--local</option> option causes <command>mysqlimport</command> to read data files from the - client host. You can specify the <literal>--compress</literal> + client host. You can specify the <option>--compress</option> option to get better performance over slow networks if the client and server support the compressed protocol. See <xref linkend="mysqlimport"/>. @@ -5005,8 +5006,8 @@ <literal>LOCAL</literal> works only if your server and your client both have been enabled to allow it. For example, if <command>mysqld</command> was started with - <literal>--local-infile=0</literal>, <literal>LOCAL</literal> - does not work. See <xref linkend="load-data-local"/>. + <option>--local-infile=0</option>, <literal>LOCAL</literal> does + not work. See <xref linkend="load-data-local"/>. </para> <para> @@ -6533,7 +6534,7 @@ The <literal>LIMIT</literal> clause can be used to constrain the number of rows returned by the <literal>SELECT</literal> statement. <literal>LIMIT</literal> takes one or two numeric - arguments, which must both be non-negative integer + arguments, which must both be non-negative integer constants. </para> @@ -10000,7 +10001,7 @@ <para> You can set the initial default global isolation level for <command>mysqld</command> with the - <literal>--transaction-isolation</literal> option. See + <option>--transaction-isolation</option> option. See <xref linkend="server-options"/>. </para> @@ -10722,14 +10723,14 @@ database-level statement, so none of the global-only privileges such as <literal>FILE</literal> are granted. </para> - + <para> - MySQL allows you to grant privileges even on database objects - that do not exist. In such cases, the privileges to be granted - must include the <literal>CREATE</literal> privilege. - <emphasis>This behaviour is by design</emphasis>, and is - intended to allow the database administrator to prepare user - accounts and privileges for database objects that are to be + MySQL allows you to grant privileges even on database objects + that do not exist. In such cases, the privileges to be granted + must include the <literal>CREATE</literal> privilege. + <emphasis>This behaviour is by design</emphasis>, and is + intended to allow the database administrator to prepare user + accounts and privileges for database objects that are to be created at a later time. </para> @@ -10964,7 +10965,7 @@ DATABASE</literal> statement. Accounts that do not have this privilege see only databases for which they have some privileges, and cannot use the statement at all if the server - was started with the <literal>--skip-show-database</literal> + was started with the <option>--skip-show-database</option> option. </para> @@ -12041,10 +12042,9 @@ <para> You can get <literal>OPTIMIZE TABLE</literal> to work on other table types by starting <command>mysqld</command> with the - <literal>--skip-new</literal> or - <literal>--safe-mode</literal> option; in this case, - <literal>OPTIMIZE TABLE</literal> is just mapped to - <literal>ALTER TABLE</literal>. + <option>--skip-new</option> or <option>--safe-mode</option> + option; in this case, <literal>OPTIMIZE TABLE</literal> is + just mapped to <literal>ALTER TABLE</literal>. </para> <para> @@ -13440,7 +13440,7 @@ <para> If the server was started with the - <literal>--skip-show-database</literal> option, you cannot use + <option>--skip-show-database</option> option, you cannot use this statement at all unless you have the <literal>SHOW DATABASES</literal> privilege. </para> @@ -13646,8 +13646,8 @@ A <literal>Support</literal> value indicates whether the particular storage engine is supported, and which is the default engine. For example, if the server is started with the - <literal>--default-table-type=InnoDB</literal> option, then - the <literal>Support</literal> value for the + <option>--default-table-type=InnoDB</option> option, then the + <literal>Support</literal> value for the <literal>InnoDB</literal> row has the value <literal>DEFAULT</literal>. </para> @@ -14554,7 +14554,7 @@ the table. If you are not using multiple <command>mysqld</command> servers that are accessing the same tables, you can disable system locks with the - <literal>--skip-external-locking</literal> option. + <option>--skip-external-locking</option> option. </para> </listitem> @@ -15157,9 +15157,9 @@ <listitem> <para> <literal>Statement</literal>: The statement to be - executed when the trigger is invoked. This is the same - as the text shown in the - <literal>ACTION_STATEMENT</literal> column of + executed when the trigger is invoked. This is the same + as the text shown in the + <literal>ACTION_STATEMENT</literal> column of <literal>INFORMATION_SCHEMA.TRIGGERS</literal>. </para> </listitem> @@ -15678,7 +15678,7 @@ the host tables allows the host to attempt to connect again. See <xref linkend="blocked-host"/>. You can start <command>mysqld</command> with - <literal>--max_connect_errors=999999999</literal> to avoid + <option>--max_connect_errors=999999999</option> to avoid this error message. </para> </listitem> @@ -15690,7 +15690,7 @@ <para> Reloads the DES keys from the file that was specified with - the <literal>--des-key-file</literal> option at server + the <option>--des-key-file</option> option at server startup time. </para> </listitem> @@ -16478,7 +16478,7 @@ <para> Displays a list of slaves currently registered with the master. Any slave not started with the - <literal>--report-host=<replaceable>slave_name</replaceable></literal> + <option>--report-host=<replaceable>slave_name</replaceable></option> option is not visible in that list. <!-- end_description_for_help_topic --> @@ -16720,14 +16720,14 @@ the server purge the binary logs. If using MySQL 4.1.1 or newer, use <literal>SET GLOBAL relay_log_purge=0</literal> for additional safety. Then start the server without the - <literal>--log-bin</literal> option. Before MySQL 4.0.19, - start it with a new (different from before) server id; in - newer versions there is no need, just use the - <literal>--replicate-same-server-id</literal> option. Start it - with <literal>--relay-log=myhost-bin</literal> (to make the + <option>--log-bin</option> option. Before MySQL 4.0.19, start + it with a new (different from before) server id; in newer + versions there is no need, just use the + <option>--replicate-same-server-id</option> option. Start it + with <option>--relay-log=myhost-bin</option> (to make the server believe that these regular binary logs are relay logs) - and with <literal>--skip-slave-start</literal>. After the - server starts, issue these statements: + and with <option>--skip-slave-start</option>. After the server + starts, issue these statements: </para> <programlisting> @@ -16776,13 +16776,13 @@ <literal>MASTER_LOG_POS</literal> so that the slave starts replicating from the correct position. Any table and database exclusion rules specified with the - <literal>--replicate-*-do-*</literal> and - <literal>--replicate-*-ignore-*</literal> options are honored. - <literal>--replicate-rewrite-db</literal> is + <option>--replicate-*-do-*</option> and + <option>--replicate-*-ignore-*</option> options are honored. + <option>--replicate-rewrite-db</option> is <emphasis>not</emphasis> taken into account (because one user could, with this option, set up a non-unique mapping such as - <literal>--replicate-rewrite-db=db1->db3</literal> and - <literal>--replicate-rewrite-db=db2->db3</literal>, which + <option>--replicate-rewrite-db=db1->db3</option> and + <option>--replicate-rewrite-db=db2->db3</option>, which would confuse the slave when it loads the master's tables). </para> @@ -17145,7 +17145,7 @@ <para> The current value of the - <literal>--master-connect-retry</literal> option. + <option>--master-connect-retry</option> option. </para> </listitem> @@ -17231,8 +17231,8 @@ <para> The lists of databases that were specified with the - <literal>--replicate-do-db</literal> and - <literal>--replicate-ignore-db</literal> options, if any. + <option>--replicate-do-db</option> and + <option>--replicate-ignore-db</option> options, if any. </para> <para> @@ -17249,11 +17249,11 @@ <para> The lists of tables that were specified with the - <literal>--replicate-do-table</literal>, - <literal>--replicate-ignore-table</literal>, - <literal>--replicate-wild-do-table</literal>, and - <literal>--replicate-wild-ignore_table</literal> options, - if any. + <option>--replicate-do-table</option>, + <option>--replicate-ignore-table</option>, + <option>--replicate-wild-do-table</option>, and + <option>--replicate-wild-ignore_table</option> options, if + any. </para> <para> @@ -17433,11 +17433,11 @@ <para> The values of the other SSL-related fields correspond to - the values of the <literal>--master-ca</literal>, - <literal>--master-capath</literal>, - <literal>--master-cert</literal>, - <literal>--master-cipher</literal>, and - <literal>--master-key</literal> options. + the values of the <option>--master-ca</option>, + <option>--master-capath</option>, + <option>--master-cert</option>, + <option>--master-cipher</option>, and + <option>--master-key</option> options. </para> <para> @@ -17606,8 +17606,8 @@ If you are using <literal>UNTIL</literal> to have the slave process replicated queries in sections, it is recommended that you start the slave with the - <literal>--skip-slave-start</literal> option to prevent the - SQL thread from running when the slave server starts. It is + <option>--skip-slave-start</option> option to prevent the SQL + thread from running when the slave server starts. It is probably best to use this option in an option file rather than on the command line, so that an unexpected server restart does not cause it to be forgotten. --- 1.4/refman-5.0/sql-syntax.xml 2005-08-06 02:00:06 -05:00 +++ 1.5/refman-5.0/sql-syntax.xml 2005-08-08 14:48:04 -05:00 @@ -832,9 +832,9 @@ AUTO_INCREMENT=<replaceable>value</replaceable></literal> table option for <literal>InnoDB</literal> tables to set the sequence number for new rows if the value is greater than the maximum - value in the <literal>AUTO_INCREMENT</literal> column. - <emphasis>If the value is less than the current maximum value in - the column, no error message is given and the current sequence + value in the <literal>AUTO_INCREMENT</literal> column. + <emphasis>If the value is less than the current maximum value in + the column, no error message is given and the current sequence value is not changed.</emphasis> </para> @@ -1412,7 +1412,7 @@ <para> In MySQL 5.0, specifying the <literal>NO_AUTO_VALUE_ON_ZERO</literal> flag for the - <literal>--sql-mode</literal> server option or the + <option>--sql-mode</option> server option or the <literal>sql_mode</literal> system variable allows you to store <literal>0</literal> in <literal>AUTO_INCREMENT</literal> columns as @@ -1966,9 +1966,9 @@ <listitem> <para> - For <literal>MyISAM</literal> tables, each - <literal>NULL</literal> column takes one bit extra, rounded - up to the nearest byte. The maximum record length in bytes + For <literal>MyISAM</literal> tables, each + <literal>NULL</literal> column takes one bit extra, rounded + up to the nearest byte. The maximum record length in bytes can be calculated as follows: </para> @@ -2450,7 +2450,7 @@ <para> These options work only when you are not using the - <literal>--skip-symbolic-links</literal> option. Your + <option>--skip-symbolic-links</option> option. Your operating system must also have a working, thread-safe <literal>realpath()</literal> call. See <xref linkend="symbolic-links-to-tables"/> for more complete @@ -3964,9 +3964,9 @@ <para> If you specify <literal>HIGH_PRIORITY</literal>, it overrides the effect of the - <literal>--low-priority-updates</literal> option if the - server was started with that option. It also causes - concurrent inserts not to be used. + <option>--low-priority-updates</option> option if the server + was started with that option. It also causes concurrent + inserts not to be used. </para> </listitem> @@ -4689,9 +4689,9 @@ You can also load data files by using the <command>mysqlimport</command> utility; it operates by sending a <literal>LOAD DATA INFILE</literal> statement to the server. The - <literal>--local</literal> option causes + <option>--local</option> option causes <command>mysqlimport</command> to read data files from the - client host. You can specify the <literal>--compress</literal> + client host. You can specify the <option>--compress</option> option to get better performance over slow networks if the client and server support the compressed protocol. See <xref linkend="mysqlimport"/>. @@ -4824,9 +4824,8 @@ In MySQL 5.0, <literal>LOCAL</literal> works only if your server and your client both have been enabled to allow it. For example, if <command>mysqld</command> was started with - <literal>--local-infile=0</literal>, then - <literal>LOCAL</literal> does not work. See - <xref linkend="load-data-local"/>. + <option>--local-infile=0</option>, then <literal>LOCAL</literal> + does not work. See <xref linkend="load-data-local"/>. </para> <para> @@ -6325,7 +6324,7 @@ The <literal>LIMIT</literal> clause can be used to constrain the number of rows returned by the <literal>SELECT</literal> statement. <literal>LIMIT</literal> takes one or two numeric - arguments, which must both be non-negative integer + arguments, which must both be non-negative integer constants. </para> @@ -9710,7 +9709,7 @@ <para> You can set the initial default global isolation level for <command>mysqld</command> with the - <literal>--transaction-isolation</literal> option. See + <option>--transaction-isolation</option> option. See <xref linkend="server-options"/>. </para> @@ -10392,14 +10391,14 @@ database-level statement, so none of the global-only privileges such as <literal>FILE</literal> are granted. </para> - + <para> - MySQL allows you to grant privileges even on database objects - that do not exist. In such cases, the privileges to be granted - must include the <literal>CREATE</literal> privilege. - <emphasis>This behaviour is by design</emphasis>, and is - intended to allow the database administrator to prepare user - accounts and privileges for database objects that are to be + MySQL allows you to grant privileges even on database objects + that do not exist. In such cases, the privileges to be granted + must include the <literal>CREATE</literal> privilege. + <emphasis>This behaviour is by design</emphasis>, and is + intended to allow the database administrator to prepare user + accounts and privileges for database objects that are to be created at a later time. </para> @@ -10636,7 +10635,7 @@ DATABASE</literal> statement. Accounts that do not have this privilege see only databases for which they have some privileges, and cannot use the statement at all if the server - was started with the <literal>--skip-show-database</literal> + was started with the <option>--skip-show-database</option> option. </para> @@ -11707,10 +11706,9 @@ <para> You can get <literal>OPTIMIZE TABLE</literal> to work on other table types by starting <command>mysqld</command> with the - <literal>--skip-new</literal> or - <literal>--safe-mode</literal> option; in this case, - <literal>OPTIMIZE TABLE</literal> is just mapped to - <literal>ALTER TABLE</literal>. + <option>--skip-new</option> or <option>--safe-mode</option> + option; in this case, <literal>OPTIMIZE TABLE</literal> is + just mapped to <literal>ALTER TABLE</literal>. </para> <para> @@ -12465,7 +12463,7 @@ </para> <para> - This variable is deprecated, and is mapped to + This variable is deprecated, and is mapped to <literal>SQL_LOG_BIN</literal>. </para> </listitem> @@ -13041,7 +13039,7 @@ <para> If the server was started with the - <literal>--skip-show-database</literal> option, you cannot use + <option>--skip-show-database</option> option, you cannot use this statement at all unless you have the <literal>SHOW DATABASES</literal> privilege. </para> @@ -13252,8 +13250,8 @@ A <literal>Support</literal> value indicates whether the particular storage engine is supported, and which is the default engine. For example, if the server is started with the - <literal>--default-table-type=InnoDB</literal> option, then - the <literal>Support</literal> value for the + <option>--default-table-type=InnoDB</option> option, then the + <literal>Support</literal> value for the <literal>InnoDB</literal> row has the value <literal>DEFAULT</literal>. </para> @@ -14134,7 +14132,7 @@ the table. If you are not using multiple <command>mysqld</command> servers that are accessing the same tables, you can disable system locks with the - <literal>--skip-external-locking</literal> option. + <option>--skip-external-locking</option> option. </para> </listitem> @@ -14351,18 +14349,20 @@ table. You can also get this list using the <command>mysqlshow --status <replaceable>db_name</replaceable></command> command. </para> + <para> As of MySQL 5.0.1, this statement also displays information about views. </para> + <para> - Beginning with MySQL 5.0.3, for <literal>NDB Cluster</literal> - tables, the output of this statement shows appropriate values - for the <literal>Avg_row_length</literal> and - <literal>Data_length</literal> columns, with the exception - that <literal>BLOB</literal> columns are not yet taken into - account. In addition, the number of replicas is now shown - in the <literal>Comment</literal> column (as + Beginning with MySQL 5.0.3, for <literal>NDB Cluster</literal> + tables, the output of this statement shows appropriate values + for the <literal>Avg_row_length</literal> and + <literal>Data_length</literal> columns, with the exception + that <literal>BLOB</literal> columns are not yet taken into + account. In addition, the number of replicas is now shown in + the <literal>Comment</literal> column (as <literal>number_of_replicas</literal>). </para> @@ -14749,9 +14749,9 @@ <listitem> <para> <literal>Statement</literal>: The statement to be - executed when the trigger is invoked. This is the same - as the text shown in the - <literal>ACTION_STATEMENT</literal> column of + executed when the trigger is invoked. This is the same + as the text shown in the + <literal>ACTION_STATEMENT</literal> column of <literal>INFORMATION_SCHEMA.TRIGGERS</literal>. </para> </listitem> @@ -15290,7 +15290,7 @@ the host tables allows the host to attempt to connect again. See <xref linkend="blocked-host"/>. You can start <command>mysqld</command> with - <literal>--max_connect_errors=999999999</literal> to avoid + <option>--max_connect_errors=999999999</option> to avoid this error message. </para> </listitem> @@ -15302,7 +15302,7 @@ <para> Reloads the DES keys from the file that was specified with - the <literal>--des-key-file</literal> option at server + the <option>--des-key-file</option> option at server startup time. </para> </listitem> @@ -16068,7 +16068,7 @@ <para> Displays a list of replication slaves currently registered with the master. Any slave not started with the - <literal>--report-host=<replaceable>slave_name</replaceable></literal> + <option>--report-host=<replaceable>slave_name</replaceable></option> option is not visible in this list. <!-- end_description_for_help_topic --> @@ -16298,11 +16298,11 @@ accidentally have the server purge the binary logs. In MySQL 5.0, use <literal>SET GLOBAL relay_log_purge=0</literal> for additional safety. Then start the server without the - <literal>--log-bin</literal> option, Instead, use the - <literal>--replicate-same-server-id</literal>, - <literal>--relay-log=myhost-bin</literal> (to make the server + <option>--log-bin</option> option, Instead, use the + <option>--replicate-same-server-id</option>, + <option>--relay-log=myhost-bin</option> (to make the server believe that these regular binary logs are relay logs), - <literal>--skip-slave-start</literal> options. Once the server + <option>--skip-slave-start</option> options. Once the server starts, issue these statements: </para> @@ -16353,13 +16353,13 @@ <literal>MASTER_LOG_POS</literal> so that the slave starts replicating from the correct position. Any table and database exclusion rules specified with the - <literal>--replicate-*-do-*</literal> and - <literal>--replicate-*-ignore-*</literal> options are honored. - <literal>--replicate-rewrite-db</literal> is + <option>--replicate-*-do-*</option> and + <option>--replicate-*-ignore-*</option> options are honored. + <option>--replicate-rewrite-db</option> is <emphasis>not</emphasis> taken into account. This is because a user could, with this option, set up a non-unique mapping such - as <literal>--replicate-rewrite-db=db1->db3</literal> and - <literal>--replicate-rewrite-db=db2->db3</literal>, which + as <option>--replicate-rewrite-db=db1->db3</option> and + <option>--replicate-rewrite-db=db2->db3</option>, which would confuse the slave when loading tables from the master. </para> @@ -16702,7 +16702,7 @@ <para> The current value of the - <literal>--master-connect-retry</literal> option. + <option>--master-connect-retry</option> option. </para> </listitem> @@ -16788,8 +16788,8 @@ <para> The lists of databases that were specified with the - <literal>--replicate-do-db</literal> and - <literal>--replicate-ignore-db</literal> options, if any. + <option>--replicate-do-db</option> and + <option>--replicate-ignore-db</option> options, if any. </para> </listitem> @@ -16802,11 +16802,11 @@ <para> The lists of tables that were specified with the - <literal>--replicate-do-table</literal>, - <literal>--replicate-ignore-table</literal>, - <literal>--replicate-wild-do-table</literal>, and - <literal>--replicate-wild-ignore_table</literal> options, - if any. + <option>--replicate-do-table</option>, + <option>--replicate-ignore-table</option>, + <option>--replicate-wild-do-table</option>, and + <option>--replicate-wild-ignore_table</option> options, if + any. </para> </listitem> @@ -16972,11 +16972,11 @@ <para> The values of the other SSL-related fields correspond to - the values of the <literal>--master-ca</literal>, - <literal>--master-capath</literal>, - <literal>--master-cert</literal>, - <literal>--master-cipher</literal>, and - <literal>--master-key</literal> options. + the values of the <option>--master-ca</option>, + <option>--master-capath</option>, + <option>--master-cert</option>, + <option>--master-cipher</option>, and + <option>--master-key</option> options. </para> </listitem> @@ -17141,8 +17141,8 @@ If you are using <literal>UNTIL</literal> to have the slave process replicated queries in sections, it is recommended that you start the slave with the - <literal>--skip-slave-start</literal> option to prevent the - SQL thread from running when the slave server starts. It is + <option>--skip-slave-start</option> option to prevent the SQL + thread from running when the slave server starts. It is probably best to use this option in an option file rather than on the command line, so that an unexpected server restart does not cause it to be forgotten.
| Thread | ||
|---|---|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3208) | paul | 8 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.986 sec. using MySQL 5.1.14-beta-log