Author: paul
Date: 2007-04-07 17:10:42 +0200 (Sat, 07 Apr 2007)
New Revision: 5770
Log:
r18817@frost: paul | 2007-04-07 10:06:36 -0500
Update error messages, reserved words.
Modified:
trunk/refman-5.1/errmsgs-server.xml
trunk/refman-5.1/reserved-new-5.1.xml
trunk/refman-5.1/reservedwords.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22987
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18816
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22987
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18817
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml 2007-04-07 15:10:14 UTC (rev 5769)
+++ trunk/refman-5.1/errmsgs-server.xml 2007-04-07 15:10:42 UTC (rev 5770)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 454 bytes
@@ -6112,7 +6112,7 @@
<para>
Message: Cannot load from mysql.%s. The table is probably
- corrupted. Please see the error log for details
+ corrupted
</para>
</listitem>
Modified: trunk/refman-5.1/reserved-new-5.1.xml
===================================================================
--- trunk/refman-5.1/reserved-new-5.1.xml 2007-04-07 15:10:14 UTC (rev 5769)
+++ trunk/refman-5.1/reserved-new-5.1.xml 2007-04-07 15:10:42 UTC (rev 5770)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 787 bytes
@@ -16,12 +16,12 @@
<row>
<entry><literal>ACCESSIBLE</literal></entry>
<entry><literal>LINEAR</literal></entry>
- <entry><literal>RANGE</literal></entry>
+ <entry><literal>MASTER_SSL_VERIFY_SERVER_CERT</literal></entry>
</row>
<row>
+ <entry><literal>RANGE</literal></entry>
<entry><literal>READ_ONLY</literal></entry>
<entry><literal>READ_WRITE</literal></entry>
- <entry></entry>
</row>
</tbody>
</tgroup>
Modified: trunk/refman-5.1/reservedwords.xml
===================================================================
--- trunk/refman-5.1/reservedwords.xml 2007-04-07 15:10:14 UTC (rev 5769)
+++ trunk/refman-5.1/reservedwords.xml 2007-04-07 15:10:42 UTC (rev 5770)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 35; 8186 bytes
@@ -213,177 +213,177 @@
<row>
<entry><literal>LOOP</literal></entry>
<entry><literal>LOW_PRIORITY</literal></entry>
- <entry><literal>MATCH</literal></entry>
+ <entry><literal>MASTER_SSL_VERIFY_SERVER_CERT</literal></entry>
</row>
<row>
+ <entry><literal>MATCH</literal></entry>
<entry><literal>MEDIUMBLOB</literal></entry>
<entry><literal>MEDIUMINT</literal></entry>
- <entry><literal>MEDIUMTEXT</literal></entry>
</row>
<row>
+ <entry><literal>MEDIUMTEXT</literal></entry>
<entry><literal>MIDDLEINT</literal></entry>
<entry><literal>MINUTE_MICROSECOND</literal></entry>
- <entry><literal>MINUTE_SECOND</literal></entry>
</row>
<row>
+ <entry><literal>MINUTE_SECOND</literal></entry>
<entry><literal>MOD</literal></entry>
<entry><literal>MODIFIES</literal></entry>
- <entry><literal>NATURAL</literal></entry>
</row>
<row>
+ <entry><literal>NATURAL</literal></entry>
<entry><literal>NOT</literal></entry>
<entry><literal>NO_WRITE_TO_BINLOG</literal></entry>
- <entry><literal>NULL</literal></entry>
</row>
<row>
+ <entry><literal>NULL</literal></entry>
<entry><literal>NUMERIC</literal></entry>
<entry><literal>ON</literal></entry>
- <entry><literal>OPTIMIZE</literal></entry>
</row>
<row>
+ <entry><literal>OPTIMIZE</literal></entry>
<entry><literal>OPTION</literal></entry>
<entry><literal>OPTIONALLY</literal></entry>
- <entry><literal>OR</literal></entry>
</row>
<row>
+ <entry><literal>OR</literal></entry>
<entry><literal>ORDER</literal></entry>
<entry><literal>OUT</literal></entry>
- <entry><literal>OUTER</literal></entry>
</row>
<row>
+ <entry><literal>OUTER</literal></entry>
<entry><literal>OUTFILE</literal></entry>
<entry><literal>PRECISION</literal></entry>
- <entry><literal>PRIMARY</literal></entry>
</row>
<row>
+ <entry><literal>PRIMARY</literal></entry>
<entry><literal>PROCEDURE</literal></entry>
<entry><literal>PURGE</literal></entry>
- <entry><literal>RANGE</literal></entry>
</row>
<row>
+ <entry><literal>RANGE</literal></entry>
<entry><literal>READ</literal></entry>
<entry><literal>READS</literal></entry>
- <entry><literal>READ_ONLY</literal></entry>
</row>
<row>
+ <entry><literal>READ_ONLY</literal></entry>
<entry><literal>READ_WRITE</literal></entry>
<entry><literal>REAL</literal></entry>
- <entry><literal>REFERENCES</literal></entry>
</row>
<row>
+ <entry><literal>REFERENCES</literal></entry>
<entry><literal>REGEXP</literal></entry>
<entry><literal>RELEASE</literal></entry>
- <entry><literal>RENAME</literal></entry>
</row>
<row>
+ <entry><literal>RENAME</literal></entry>
<entry><literal>REPEAT</literal></entry>
<entry><literal>REPLACE</literal></entry>
- <entry><literal>REQUIRE</literal></entry>
</row>
<row>
+ <entry><literal>REQUIRE</literal></entry>
<entry><literal>RESTRICT</literal></entry>
<entry><literal>RETURN</literal></entry>
- <entry><literal>REVOKE</literal></entry>
</row>
<row>
+ <entry><literal>REVOKE</literal></entry>
<entry><literal>RIGHT</literal></entry>
<entry><literal>RLIKE</literal></entry>
- <entry><literal>SCHEMA</literal></entry>
</row>
<row>
+ <entry><literal>SCHEMA</literal></entry>
<entry><literal>SCHEMAS</literal></entry>
<entry><literal>SECOND_MICROSECOND</literal></entry>
- <entry><literal>SELECT</literal></entry>
</row>
<row>
+ <entry><literal>SELECT</literal></entry>
<entry><literal>SENSITIVE</literal></entry>
<entry><literal>SEPARATOR</literal></entry>
- <entry><literal>SET</literal></entry>
</row>
<row>
+ <entry><literal>SET</literal></entry>
<entry><literal>SHOW</literal></entry>
<entry><literal>SMALLINT</literal></entry>
- <entry><literal>SPATIAL</literal></entry>
</row>
<row>
+ <entry><literal>SPATIAL</literal></entry>
<entry><literal>SPECIFIC</literal></entry>
<entry><literal>SQL</literal></entry>
- <entry><literal>SQLEXCEPTION</literal></entry>
</row>
<row>
+ <entry><literal>SQLEXCEPTION</literal></entry>
<entry><literal>SQLSTATE</literal></entry>
<entry><literal>SQLWARNING</literal></entry>
- <entry><literal>SQL_BIG_RESULT</literal></entry>
</row>
<row>
+ <entry><literal>SQL_BIG_RESULT</literal></entry>
<entry><literal>SQL_CALC_FOUND_ROWS</literal></entry>
<entry><literal>SQL_SMALL_RESULT</literal></entry>
- <entry><literal>SSL</literal></entry>
</row>
<row>
+ <entry><literal>SSL</literal></entry>
<entry><literal>STARTING</literal></entry>
<entry><literal>STRAIGHT_JOIN</literal></entry>
- <entry><literal>TABLE</literal></entry>
</row>
<row>
+ <entry><literal>TABLE</literal></entry>
<entry><literal>TERMINATED</literal></entry>
<entry><literal>THEN</literal></entry>
- <entry><literal>TINYBLOB</literal></entry>
</row>
<row>
+ <entry><literal>TINYBLOB</literal></entry>
<entry><literal>TINYINT</literal></entry>
<entry><literal>TINYTEXT</literal></entry>
- <entry><literal>TO</literal></entry>
</row>
<row>
+ <entry><literal>TO</literal></entry>
<entry><literal>TRAILING</literal></entry>
<entry><literal>TRIGGER</literal></entry>
- <entry><literal>TRUE</literal></entry>
</row>
<row>
+ <entry><literal>TRUE</literal></entry>
<entry><literal>UNDO</literal></entry>
<entry><literal>UNION</literal></entry>
- <entry><literal>UNIQUE</literal></entry>
</row>
<row>
+ <entry><literal>UNIQUE</literal></entry>
<entry><literal>UNLOCK</literal></entry>
<entry><literal>UNSIGNED</literal></entry>
- <entry><literal>UPDATE</literal></entry>
</row>
<row>
+ <entry><literal>UPDATE</literal></entry>
<entry><literal>USAGE</literal></entry>
<entry><literal>USE</literal></entry>
- <entry><literal>USING</literal></entry>
</row>
<row>
+ <entry><literal>USING</literal></entry>
<entry><literal>UTC_DATE</literal></entry>
<entry><literal>UTC_TIME</literal></entry>
- <entry><literal>UTC_TIMESTAMP</literal></entry>
</row>
<row>
+ <entry><literal>UTC_TIMESTAMP</literal></entry>
<entry><literal>VALUES</literal></entry>
<entry><literal>VARBINARY</literal></entry>
- <entry><literal>VARCHAR</literal></entry>
</row>
<row>
+ <entry><literal>VARCHAR</literal></entry>
<entry><literal>VARCHARACTER</literal></entry>
<entry><literal>VARYING</literal></entry>
- <entry><literal>WHEN</literal></entry>
</row>
<row>
+ <entry><literal>WHEN</literal></entry>
<entry><literal>WHERE</literal></entry>
<entry><literal>WHILE</literal></entry>
- <entry><literal>WITH</literal></entry>
</row>
<row>
+ <entry><literal>WITH</literal></entry>
<entry><literal>WRITE</literal></entry>
<entry><literal>X509</literal></entry>
- <entry><literal>XOR</literal></entry>
</row>
<row>
+ <entry><literal>XOR</literal></entry>
<entry><literal>YEAR_MONTH</literal></entry>
<entry><literal>ZEROFILL</literal></entry>
- <entry></entry>
</row>
</tbody>
</tgroup>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5770 - in trunk: . refman-5.1 | paul | 7 Apr |
