| List: | Internals | « Previous MessageNext Message » | |
| From: | paul | Date: | November 10 2005 9:32pm |
| Subject: | svn commit - mysqldoc@docsrva: r311 - in trunk: . refman-5.0 refman-5.1 tools | ||
| View as plain text | |||
Author: paul Date: 2005-11-10 21:32:12 +0100 (Thu, 10 Nov 2005) New Revision: 311 Log: r932@kite-hub: paul | 2005-11-10 14:18:17 -0600 Fix bug in reserved-word-list generator due to change in 5.0 sql_yacc.yy. Update reserved-word lists. Modified: trunk/ trunk/refman-5.0/reservedwords.xml trunk/refman-5.1/reservedwords.xml trunk/tools/update-reserved-words.pl Property changes on: trunk ___________________________________________________________________ Name: svk:merge - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:3626 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:922 + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:3626 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:932 Modified: trunk/refman-5.0/reservedwords.xml =================================================================== --- trunk/refman-5.0/reservedwords.xml 2005-11-10 17:35:35 UTC (rev 310) +++ trunk/refman-5.0/reservedwords.xml 2005-11-10 20:32:12 UTC (rev 311) @@ -11,114 +11,49 @@ <colspec colwidth='33*'/> <tbody> <row> - <entry>ACTION</entry> <entry>ADD</entry> - <entry>AFTER</entry> - </row> - <row> - <entry>AGAINST</entry> - <entry>AGGREGATE</entry> - <entry>ALGORITHM</entry> - </row> - <row> <entry>ALL</entry> <entry>ALTER</entry> - <entry>ANALYZE</entry> </row> <row> + <entry>ANALYZE</entry> <entry>AND</entry> - <entry>ANY</entry> <entry>AS</entry> </row> <row> <entry>ASC</entry> - <entry>ASCII</entry> <entry>ASENSITIVE</entry> - </row> - <row> - <entry>AUTO_INCREMENT</entry> - <entry>AVG</entry> - <entry>AVG_ROW_LENGTH</entry> - </row> - <row> - <entry>BACKUP</entry> - <entry>BDB</entry> <entry>BEFORE</entry> </row> <row> - <entry>BEGIN</entry> - <entry>BERKELEYDB</entry> <entry>BETWEEN</entry> - </row> - <row> <entry>BIGINT</entry> <entry>BINARY</entry> - <entry>BINLOG</entry> </row> <row> - <entry>BIT</entry> <entry>BLOB</entry> - <entry>BOOL</entry> - </row> - <row> - <entry>BOOLEAN</entry> <entry>BOTH</entry> - <entry>BTREE</entry> - </row> - <row> <entry>BY</entry> - <entry>BYTE</entry> - <entry>CACHE</entry> </row> <row> <entry>CALL</entry> <entry>CASCADE</entry> - <entry>CASCADED</entry> - </row> - <row> <entry>CASE</entry> - <entry>CHAIN</entry> - <entry>CHANGE</entry> </row> <row> - <entry>CHANGED</entry> + <entry>CHANGE</entry> <entry>CHAR</entry> <entry>CHARACTER</entry> </row> <row> - <entry>CHARSET</entry> <entry>CHECK</entry> - <entry>CHECKSUM</entry> - </row> - <row> - <entry>CIPHER</entry> - <entry>CLIENT</entry> - <entry>CLOSE</entry> - </row> - <row> <entry>COLLATE</entry> - <entry>COLLATION</entry> <entry>COLUMN</entry> </row> <row> - <entry>COLUMNS</entry> - <entry>COMMENT</entry> - <entry>COMMIT</entry> - </row> - <row> - <entry>COMMITTED</entry> - <entry>COMPACT</entry> - <entry>COMPRESSED</entry> - </row> - <row> - <entry>CONCURRENT</entry> <entry>CONDITION</entry> <entry>CONNECTION</entry> - </row> - <row> - <entry>CONSISTENT</entry> <entry>CONSTRAINT</entry> - <entry>CONTAINS</entry> </row> <row> <entry>CONTINUE</entry> @@ -127,33 +62,23 @@ </row> <row> <entry>CROSS</entry> - <entry>CUBE</entry> <entry>CURRENT_DATE</entry> + <entry>CURRENT_TIME</entry> </row> <row> - <entry>CURRENT_TIME</entry> <entry>CURRENT_TIMESTAMP</entry> <entry>CURRENT_USER</entry> - </row> - <row> <entry>CURSOR</entry> - <entry>DATA</entry> - <entry>DATABASE</entry> </row> <row> + <entry>DATABASE</entry> <entry>DATABASES</entry> - <entry>DATE</entry> - <entry>DATETIME</entry> - </row> - <row> - <entry>DAY</entry> <entry>DAY_HOUR</entry> - <entry>DAY_MICROSECOND</entry> </row> <row> + <entry>DAY_MICROSECOND</entry> <entry>DAY_MINUTE</entry> <entry>DAY_SECOND</entry> - <entry>DEALLOCATE</entry> </row> <row> <entry>DEC</entry> @@ -162,183 +87,98 @@ </row> <row> <entry>DEFAULT</entry> - <entry>DEFINER</entry> <entry>DELAYED</entry> - </row> - <row> - <entry>DELAY_KEY_WRITE</entry> <entry>DELETE</entry> - <entry>DESC</entry> </row> <row> + <entry>DESC</entry> <entry>DESCRIBE</entry> - <entry>DES_KEY_FILE</entry> <entry>DETERMINISTIC</entry> </row> <row> - <entry>DIRECTORY</entry> - <entry>DISABLE</entry> - <entry>DISCARD</entry> - </row> - <row> <entry>DISTINCT</entry> <entry>DISTINCTROW</entry> <entry>DIV</entry> </row> <row> - <entry>DO</entry> <entry>DOUBLE</entry> <entry>DROP</entry> - </row> - <row> <entry>DUAL</entry> - <entry>DUMPFILE</entry> - <entry>DUPLICATE</entry> </row> <row> - <entry>DYNAMIC</entry> <entry>EACH</entry> <entry>ELSE</entry> - </row> - <row> <entry>ELSEIF</entry> - <entry>ENABLE</entry> - <entry>ENCLOSED</entry> </row> <row> - <entry>END</entry> - <entry>ENGINE</entry> - <entry>ENGINES</entry> - </row> - <row> - <entry>ENUM</entry> - <entry>ERRORS</entry> - <entry>ESCAPE</entry> - </row> - <row> + <entry>ENCLOSED</entry> <entry>ESCAPED</entry> - <entry>EVENTS</entry> - <entry>EXECUTE</entry> - </row> - <row> <entry>EXISTS</entry> - <entry>EXIT</entry> - <entry>EXPANSION</entry> </row> <row> + <entry>EXIT</entry> <entry>EXPLAIN</entry> - <entry>EXTENDED</entry> <entry>FALSE</entry> </row> <row> - <entry>FAST</entry> <entry>FETCH</entry> - <entry>FIELDS</entry> - </row> - <row> - <entry>FILE</entry> - <entry>FIRST</entry> - <entry>FIXED</entry> - </row> - <row> <entry>FLOAT</entry> <entry>FLOAT4</entry> - <entry>FLOAT8</entry> </row> <row> - <entry>FLUSH</entry> + <entry>FLOAT8</entry> <entry>FOR</entry> <entry>FORCE</entry> </row> <row> <entry>FOREIGN</entry> - <entry>FOUND</entry> - <entry>FRAC_SECOND</entry> - </row> - <row> <entry>FROM</entry> - <entry>FULL</entry> <entry>FULLTEXT</entry> </row> <row> - <entry>FUNCTION</entry> - <entry>GEOMETRY</entry> - <entry>GEOMETRYCOLLECTION</entry> - </row> - <row> - <entry>GET_FORMAT</entry> - <entry>GLOBAL</entry> <entry>GOTO</entry> - </row> - <row> <entry>GRANT</entry> - <entry>GRANTS</entry> <entry>GROUP</entry> </row> <row> - <entry>HANDLER</entry> - <entry>HASH</entry> <entry>HAVING</entry> - </row> - <row> - <entry>HELP</entry> <entry>HIGH_PRIORITY</entry> - <entry>HOSTS</entry> - </row> - <row> - <entry>HOUR</entry> <entry>HOUR_MICROSECOND</entry> - <entry>HOUR_MINUTE</entry> </row> <row> + <entry>HOUR_MINUTE</entry> <entry>HOUR_SECOND</entry> - <entry>IDENTIFIED</entry> <entry>IF</entry> </row> <row> <entry>IGNORE</entry> - <entry>IMPORT</entry> <entry>IN</entry> - </row> - <row> <entry>INDEX</entry> - <entry>INDEXES</entry> - <entry>INFILE</entry> </row> <row> + <entry>INFILE</entry> <entry>INNER</entry> - <entry>INNOBASE</entry> - <entry>INNODB</entry> + <entry>INOUT</entry> </row> <row> - <entry>INOUT</entry> <entry>INSENSITIVE</entry> <entry>INSERT</entry> - </row> - <row> - <entry>INSERT_METHOD</entry> <entry>INT</entry> - <entry>INT1</entry> </row> <row> + <entry>INT1</entry> <entry>INT2</entry> <entry>INT3</entry> - <entry>INT4</entry> </row> <row> + <entry>INT4</entry> <entry>INT8</entry> <entry>INTEGER</entry> - <entry>INTERVAL</entry> </row> <row> + <entry>INTERVAL</entry> <entry>INTO</entry> - <entry>INVOKER</entry> - <entry>IO_THREAD</entry> - </row> - <row> <entry>IS</entry> - <entry>ISOLATION</entry> - <entry>ISSUER</entry> </row> <row> <entry>ITERATE</entry> @@ -351,151 +191,56 @@ <entry>LABEL</entry> </row> <row> - <entry>LANGUAGE</entry> - <entry>LAST</entry> <entry>LEADING</entry> - </row> - <row> <entry>LEAVE</entry> - <entry>LEAVES</entry> <entry>LEFT</entry> </row> <row> - <entry>LEVEL</entry> <entry>LIKE</entry> <entry>LIMIT</entry> - </row> - <row> <entry>LINES</entry> - <entry>LINESTRING</entry> - <entry>LOAD</entry> </row> <row> - <entry>LOCAL</entry> + <entry>LOAD</entry> <entry>LOCALTIME</entry> <entry>LOCALTIMESTAMP</entry> </row> <row> <entry>LOCK</entry> - <entry>LOCKS</entry> - <entry>LOGS</entry> - </row> - <row> <entry>LONG</entry> <entry>LONGBLOB</entry> - <entry>LONGTEXT</entry> </row> <row> + <entry>LONGTEXT</entry> <entry>LOOP</entry> <entry>LOW_PRIORITY</entry> - <entry>MASTER</entry> </row> <row> - <entry>MASTER_CONNECT_RETRY</entry> - <entry>MASTER_HOST</entry> - <entry>MASTER_LOG_FILE</entry> - </row> - <row> - <entry>MASTER_LOG_POS</entry> - <entry>MASTER_PASSWORD</entry> - <entry>MASTER_PORT</entry> - </row> - <row> - <entry>MASTER_SERVER_ID</entry> - <entry>MASTER_SSL</entry> - <entry>MASTER_SSL_CA</entry> - </row> - <row> - <entry>MASTER_SSL_CAPATH</entry> - <entry>MASTER_SSL_CERT</entry> - <entry>MASTER_SSL_CIPHER</entry> - </row> - <row> - <entry>MASTER_SSL_KEY</entry> - <entry>MASTER_USER</entry> <entry>MATCH</entry> - </row> - <row> - <entry>MAX_CONNECTIONS_PER_HOUR</entry> - <entry>MAX_QUERIES_PER_HOUR</entry> - <entry>MAX_ROWS</entry> - </row> - <row> - <entry>MAX_UPDATES_PER_HOUR</entry> - <entry>MAX_USER_CONNECTIONS</entry> - <entry>MEDIUM</entry> - </row> - <row> <entry>MEDIUMBLOB</entry> <entry>MEDIUMINT</entry> - <entry>MEDIUMTEXT</entry> </row> <row> - <entry>MERGE</entry> - <entry>MICROSECOND</entry> + <entry>MEDIUMTEXT</entry> <entry>MIDDLEINT</entry> - </row> - <row> - <entry>MIGRATE</entry> - <entry>MINUTE</entry> <entry>MINUTE_MICROSECOND</entry> </row> <row> <entry>MINUTE_SECOND</entry> - <entry>MIN_ROWS</entry> <entry>MOD</entry> - </row> - <row> - <entry>MODE</entry> <entry>MODIFIES</entry> - <entry>MODIFY</entry> </row> <row> - <entry>MONTH</entry> - <entry>MULTILINESTRING</entry> - <entry>MULTIPOINT</entry> - </row> - <row> - <entry>MULTIPOLYGON</entry> - <entry>MUTEX</entry> - <entry>NAME</entry> - </row> - <row> - <entry>NAMES</entry> - <entry>NATIONAL</entry> <entry>NATURAL</entry> - </row> - <row> - <entry>NCHAR</entry> - <entry>NDB</entry> - <entry>NDBCLUSTER</entry> - </row> - <row> - <entry>NEW</entry> - <entry>NEXT</entry> - <entry>NO</entry> - </row> - <row> - <entry>NONE</entry> <entry>NOT</entry> <entry>NO_WRITE_TO_BINLOG</entry> </row> <row> <entry>NULL</entry> <entry>NUMERIC</entry> - <entry>NVARCHAR</entry> - </row> - <row> - <entry>OFFSET</entry> - <entry>OLD_PASSWORD</entry> <entry>ON</entry> </row> <row> - <entry>ONE</entry> - <entry>ONE_SHOT</entry> - <entry>OPEN</entry> - </row> - <row> <entry>OPTIMIZE</entry> <entry>OPTION</entry> <entry>OPTIONALLY</entry> @@ -508,216 +253,81 @@ <row> <entry>OUTER</entry> <entry>OUTFILE</entry> - <entry>PACK_KEYS</entry> - </row> - <row> - <entry>PARTIAL</entry> - <entry>PASSWORD</entry> - <entry>PHASE</entry> - </row> - <row> - <entry>POINT</entry> - <entry>POLYGON</entry> <entry>PRECISION</entry> </row> <row> - <entry>PREPARE</entry> - <entry>PREV</entry> <entry>PRIMARY</entry> - </row> - <row> - <entry>PRIVILEGES</entry> <entry>PROCEDURE</entry> - <entry>PROCESSLIST</entry> - </row> - <row> <entry>PURGE</entry> - <entry>QUARTER</entry> - <entry>QUERY</entry> </row> <row> - <entry>QUICK</entry> <entry>RAID0</entry> - <entry>RAID_CHUNKS</entry> - </row> - <row> - <entry>RAID_CHUNKSIZE</entry> - <entry>RAID_TYPE</entry> <entry>READ</entry> - </row> - <row> <entry>READS</entry> - <entry>REAL</entry> - <entry>RECOVER</entry> </row> <row> - <entry>REDUNDANT</entry> + <entry>REAL</entry> <entry>REFERENCES</entry> <entry>REGEXP</entry> </row> <row> - <entry>RELAY_LOG_FILE</entry> - <entry>RELAY_LOG_POS</entry> - <entry>RELAY_THREAD</entry> - </row> - <row> <entry>RELEASE</entry> - <entry>RELOAD</entry> <entry>RENAME</entry> - </row> - <row> - <entry>REPAIR</entry> <entry>REPEAT</entry> - <entry>REPEATABLE</entry> </row> <row> <entry>REPLACE</entry> - <entry>REPLICATION</entry> <entry>REQUIRE</entry> - </row> - <row> - <entry>RESET</entry> - <entry>RESTORE</entry> <entry>RESTRICT</entry> </row> <row> - <entry>RESUME</entry> <entry>RETURN</entry> - <entry>RETURNS</entry> - </row> - <row> <entry>REVOKE</entry> <entry>RIGHT</entry> - <entry>RLIKE</entry> </row> <row> - <entry>ROLLBACK</entry> - <entry>ROLLUP</entry> - <entry>ROUTINE</entry> - </row> - <row> - <entry>ROW</entry> - <entry>ROWS</entry> - <entry>ROW_FORMAT</entry> - </row> - <row> - <entry>RTREE</entry> - <entry>SAVEPOINT</entry> + <entry>RLIKE</entry> <entry>SCHEMA</entry> - </row> - <row> <entry>SCHEMAS</entry> - <entry>SECOND</entry> - <entry>SECOND_MICROSECOND</entry> </row> <row> - <entry>SECURITY</entry> + <entry>SECOND_MICROSECOND</entry> <entry>SELECT</entry> <entry>SENSITIVE</entry> </row> <row> <entry>SEPARATOR</entry> - <entry>SERIAL</entry> - <entry>SERIALIZABLE</entry> - </row> - <row> - <entry>SESSION</entry> <entry>SET</entry> - <entry>SHARE</entry> - </row> - <row> <entry>SHOW</entry> - <entry>SHUTDOWN</entry> - <entry>SIGNED</entry> </row> <row> - <entry>SIMPLE</entry> - <entry>SLAVE</entry> <entry>SMALLINT</entry> - </row> - <row> - <entry>SNAPSHOT</entry> - <entry>SOME</entry> <entry>SONAME</entry> - </row> - <row> - <entry>SOUNDS</entry> <entry>SPATIAL</entry> - <entry>SPECIFIC</entry> </row> <row> + <entry>SPECIFIC</entry> <entry>SQL</entry> <entry>SQLEXCEPTION</entry> - <entry>SQLSTATE</entry> </row> <row> + <entry>SQLSTATE</entry> <entry>SQLWARNING</entry> <entry>SQL_BIG_RESULT</entry> - <entry>SQL_BUFFER_RESULT</entry> </row> <row> - <entry>SQL_CACHE</entry> <entry>SQL_CALC_FOUND_ROWS</entry> - <entry>SQL_NO_CACHE</entry> - </row> - <row> <entry>SQL_SMALL_RESULT</entry> - <entry>SQL_THREAD</entry> - <entry>SQL_TSI_DAY</entry> - </row> - <row> - <entry>SQL_TSI_FRAC_SECOND</entry> - <entry>SQL_TSI_HOUR</entry> - <entry>SQL_TSI_MINUTE</entry> - </row> - <row> - <entry>SQL_TSI_MONTH</entry> - <entry>SQL_TSI_QUARTER</entry> - <entry>SQL_TSI_SECOND</entry> - </row> - <row> - <entry>SQL_TSI_WEEK</entry> - <entry>SQL_TSI_YEAR</entry> <entry>SSL</entry> </row> <row> - <entry>START</entry> <entry>STARTING</entry> - <entry>STATUS</entry> - </row> - <row> - <entry>STOP</entry> - <entry>STORAGE</entry> <entry>STRAIGHT_JOIN</entry> - </row> - <row> - <entry>STRING</entry> - <entry>STRIPED</entry> - <entry>SUBJECT</entry> - </row> - <row> - <entry>SUPER</entry> - <entry>SUSPEND</entry> <entry>TABLE</entry> </row> <row> - <entry>TABLES</entry> - <entry>TABLESPACE</entry> - <entry>TEMPORARY</entry> - </row> - <row> - <entry>TEMPTABLE</entry> <entry>TERMINATED</entry> - <entry>TEXT</entry> - </row> - <row> <entry>THEN</entry> - <entry>TIME</entry> - <entry>TIMESTAMP</entry> - </row> - <row> - <entry>TIMESTAMPADD</entry> - <entry>TIMESTAMPDIFF</entry> <entry>TINYBLOB</entry> </row> <row> @@ -727,67 +337,37 @@ </row> <row> <entry>TRAILING</entry> - <entry>TRANSACTION</entry> <entry>TRIGGER</entry> - </row> - <row> - <entry>TRIGGERS</entry> <entry>TRUE</entry> - <entry>TRUNCATE</entry> </row> <row> - <entry>TYPE</entry> - <entry>TYPES</entry> - <entry>UNCOMMITTED</entry> - </row> - <row> - <entry>UNDEFINED</entry> <entry>UNDO</entry> - <entry>UNICODE</entry> - </row> - <row> <entry>UNION</entry> <entry>UNIQUE</entry> - <entry>UNKNOWN</entry> </row> <row> <entry>UNLOCK</entry> <entry>UNSIGNED</entry> - <entry>UNTIL</entry> + <entry>UPDATE</entry> </row> <row> - <entry>UPDATE</entry> <entry>USAGE</entry> <entry>USE</entry> + <entry>USING</entry> </row> <row> - <entry>USER</entry> - <entry>USER_RESOURCES</entry> - <entry>USE_FRM</entry> - </row> - <row> - <entry>USING</entry> <entry>UTC_DATE</entry> <entry>UTC_TIME</entry> - </row> - <row> <entry>UTC_TIMESTAMP</entry> - <entry>VALUE</entry> - <entry>VALUES</entry> </row> <row> + <entry>VALUES</entry> <entry>VARBINARY</entry> <entry>VARCHAR</entry> - <entry>VARCHARACTER</entry> </row> <row> - <entry>VARIABLES</entry> + <entry>VARCHARACTER</entry> <entry>VARYING</entry> - <entry>VIEW</entry> - </row> - <row> - <entry>WARNINGS</entry> - <entry>WEEK</entry> <entry>WHEN</entry> </row> <row> @@ -796,14 +376,9 @@ <entry>WITH</entry> </row> <row> - <entry>WORK</entry> <entry>WRITE</entry> <entry>X509</entry> - </row> - <row> - <entry>XA</entry> <entry>XOR</entry> - <entry>YEAR</entry> </row> <row> <entry>YEAR_MONTH</entry> Modified: trunk/refman-5.1/reservedwords.xml =================================================================== --- trunk/refman-5.1/reservedwords.xml 2005-11-10 17:35:35 UTC (rev 310) +++ trunk/refman-5.1/reservedwords.xml 2005-11-10 20:32:12 UTC (rev 311) @@ -11,143 +11,68 @@ <colspec colwidth='33*'/> <tbody> <row> - <entry>ACTION</entry> <entry>ADD</entry> - <entry>AFTER</entry> - </row> - <row> - <entry>AGAINST</entry> - <entry>AGGREGATE</entry> - <entry>ALGORITHM</entry> - </row> - <row> <entry>ALL</entry> <entry>ALTER</entry> - <entry>ANALYZE</entry> </row> <row> + <entry>ANALYZE</entry> <entry>AND</entry> - <entry>ANY</entry> <entry>AS</entry> </row> <row> <entry>ASC</entry> - <entry>ASCII</entry> <entry>ASENSITIVE</entry> - </row> - <row> - <entry>AUTO_INCREMENT</entry> - <entry>AVG</entry> - <entry>AVG_ROW_LENGTH</entry> - </row> - <row> - <entry>BACKUP</entry> - <entry>BDB</entry> <entry>BEFORE</entry> </row> <row> - <entry>BEGIN</entry> - <entry>BERKELEYDB</entry> <entry>BETWEEN</entry> - </row> - <row> <entry>BIGINT</entry> <entry>BINARY</entry> - <entry>BINLOG</entry> </row> <row> - <entry>BIT</entry> <entry>BLOB</entry> - <entry>BOOL</entry> - </row> - <row> - <entry>BOOLEAN</entry> <entry>BOTH</entry> - <entry>BTREE</entry> - </row> - <row> <entry>BY</entry> - <entry>BYTE</entry> - <entry>CACHE</entry> </row> <row> <entry>CALL</entry> <entry>CASCADE</entry> - <entry>CASCADED</entry> - </row> - <row> <entry>CASE</entry> - <entry>CHAIN</entry> - <entry>CHANGE</entry> </row> <row> - <entry>CHANGED</entry> + <entry>CHANGE</entry> <entry>CHAR</entry> <entry>CHARACTER</entry> </row> <row> - <entry>CHARSET</entry> <entry>CHECK</entry> - <entry>CHECKSUM</entry> - </row> - <row> - <entry>CIPHER</entry> - <entry>CLIENT</entry> - <entry>CLOSE</entry> - </row> - <row> - <entry>COALESCE</entry> <entry>COLLATE</entry> - <entry>COLLATION</entry> - </row> - <row> <entry>COLUMN</entry> - <entry>COLUMNS</entry> - <entry>COMMENT</entry> </row> <row> - <entry>COMMIT</entry> - <entry>COMMITTED</entry> - <entry>COMPACT</entry> - </row> - <row> - <entry>COMPRESSED</entry> - <entry>CONCURRENT</entry> <entry>CONDITION</entry> - </row> - <row> <entry>CONNECTION</entry> - <entry>CONSISTENT</entry> <entry>CONSTRAINT</entry> </row> <row> - <entry>CONTAINS</entry> <entry>CONTINUE</entry> <entry>CONVERT</entry> - </row> - <row> <entry>CREATE</entry> - <entry>CROSS</entry> - <entry>CUBE</entry> </row> <row> + <entry>CROSS</entry> <entry>CURRENT_DATE</entry> <entry>CURRENT_TIME</entry> - <entry>CURRENT_TIMESTAMP</entry> </row> <row> + <entry>CURRENT_TIMESTAMP</entry> <entry>CURRENT_USER</entry> <entry>CURSOR</entry> - <entry>DATA</entry> </row> <row> <entry>DATABASE</entry> <entry>DATABASES</entry> - <entry>DATE</entry> - </row> - <row> - <entry>DATETIME</entry> - <entry>DAY</entry> <entry>DAY_HOUR</entry> </row> <row> @@ -156,238 +81,133 @@ <entry>DAY_SECOND</entry> </row> <row> - <entry>DEALLOCATE</entry> <entry>DEC</entry> <entry>DECIMAL</entry> - </row> - <row> <entry>DECLARE</entry> - <entry>DEFAULT</entry> - <entry>DEFINER</entry> </row> <row> + <entry>DEFAULT</entry> <entry>DELAYED</entry> - <entry>DELAY_KEY_WRITE</entry> <entry>DELETE</entry> </row> <row> <entry>DESC</entry> <entry>DESCRIBE</entry> - <entry>DES_KEY_FILE</entry> - </row> - <row> <entry>DETERMINISTIC</entry> - <entry>DIRECTORY</entry> - <entry>DISABLE</entry> </row> <row> - <entry>DISCARD</entry> <entry>DISTINCT</entry> <entry>DISTINCTROW</entry> - </row> - <row> <entry>DIV</entry> - <entry>DO</entry> - <entry>DOUBLE</entry> </row> <row> + <entry>DOUBLE</entry> <entry>DROP</entry> <entry>DUAL</entry> - <entry>DUMPFILE</entry> </row> <row> - <entry>DUPLICATE</entry> - <entry>DYNAMIC</entry> <entry>EACH</entry> - </row> - <row> <entry>ELSE</entry> <entry>ELSEIF</entry> - <entry>ENABLE</entry> </row> <row> <entry>ENCLOSED</entry> - <entry>END</entry> - <entry>ENGINE</entry> - </row> - <row> - <entry>ENGINES</entry> - <entry>ENUM</entry> - <entry>ERRORS</entry> - </row> - <row> - <entry>ESCAPE</entry> <entry>ESCAPED</entry> - <entry>EVENTS</entry> - </row> - <row> - <entry>EXECUTE</entry> <entry>EXISTS</entry> - <entry>EXIT</entry> </row> <row> - <entry>EXPANSION</entry> + <entry>EXIT</entry> <entry>EXPLAIN</entry> - <entry>EXTENDED</entry> - </row> - <row> <entry>FALSE</entry> - <entry>FAST</entry> - <entry>FETCH</entry> </row> <row> - <entry>FIELDS</entry> - <entry>FILE</entry> - <entry>FIRST</entry> - </row> - <row> - <entry>FIXED</entry> + <entry>FETCH</entry> <entry>FLOAT</entry> <entry>FLOAT4</entry> </row> <row> <entry>FLOAT8</entry> - <entry>FLUSH</entry> <entry>FOR</entry> - </row> - <row> <entry>FORCE</entry> - <entry>FOREIGN</entry> - <entry>FOUND</entry> </row> <row> - <entry>FRAC_SECOND</entry> + <entry>FOREIGN</entry> <entry>FROM</entry> - <entry>FULL</entry> - </row> - <row> <entry>FULLTEXT</entry> - <entry>FUNCTION</entry> - <entry>GEOMETRY</entry> </row> <row> - <entry>GEOMETRYCOLLECTION</entry> - <entry>GET_FORMAT</entry> - <entry>GLOBAL</entry> - </row> - <row> <entry>GOTO</entry> <entry>GRANT</entry> - <entry>GRANTS</entry> - </row> - <row> <entry>GROUP</entry> - <entry>HANDLER</entry> - <entry>HASH</entry> </row> <row> <entry>HAVING</entry> - <entry>HELP</entry> <entry>HIGH_PRIORITY</entry> - </row> - <row> - <entry>HOSTS</entry> - <entry>HOUR</entry> <entry>HOUR_MICROSECOND</entry> </row> <row> <entry>HOUR_MINUTE</entry> <entry>HOUR_SECOND</entry> - <entry>IDENTIFIED</entry> - </row> - <row> <entry>IF</entry> - <entry>IGNORE</entry> - <entry>IMPORT</entry> </row> <row> + <entry>IGNORE</entry> <entry>IN</entry> <entry>INDEX</entry> - <entry>INDEXES</entry> </row> <row> <entry>INFILE</entry> <entry>INNER</entry> - <entry>INNOBASE</entry> - </row> - <row> - <entry>INNODB</entry> <entry>INOUT</entry> - <entry>INSENSITIVE</entry> </row> <row> + <entry>INSENSITIVE</entry> <entry>INSERT</entry> - <entry>INSERT_METHOD</entry> - <entry>INSTALL</entry> + <entry>INT</entry> </row> <row> - <entry>INT</entry> <entry>INT1</entry> <entry>INT2</entry> + <entry>INT3</entry> </row> <row> - <entry>INT3</entry> <entry>INT4</entry> <entry>INT8</entry> + <entry>INTEGER</entry> </row> <row> - <entry>INTEGER</entry> <entry>INTERVAL</entry> <entry>INTO</entry> - </row> - <row> - <entry>INVOKER</entry> - <entry>IO_THREAD</entry> <entry>IS</entry> </row> <row> - <entry>ISOLATION</entry> - <entry>ISSUER</entry> <entry>ITERATE</entry> - </row> - <row> <entry>JOIN</entry> <entry>KEY</entry> - <entry>KEYS</entry> </row> <row> + <entry>KEYS</entry> <entry>KILL</entry> <entry>LABEL</entry> - <entry>LANGUAGE</entry> </row> <row> - <entry>LAST</entry> <entry>LEADING</entry> <entry>LEAVE</entry> - </row> - <row> - <entry>LEAVES</entry> <entry>LEFT</entry> - <entry>LESS</entry> </row> <row> - <entry>LEVEL</entry> <entry>LIKE</entry> <entry>LIMIT</entry> - </row> - <row> <entry>LINEAR</entry> - <entry>LINES</entry> - <entry>LINESTRING</entry> </row> <row> - <entry>LIST</entry> + <entry>LINES</entry> <entry>LOAD</entry> - <entry>LOCAL</entry> + <entry>LOCALTIME</entry> </row> <row> - <entry>LOCALTIME</entry> <entry>LOCALTIMESTAMP</entry> <entry>LOCK</entry> - </row> - <row> - <entry>LOCKS</entry> - <entry>LOGS</entry> <entry>LONG</entry> </row> <row> @@ -397,97 +217,22 @@ </row> <row> <entry>LOW_PRIORITY</entry> - <entry>MASTER</entry> - <entry>MASTER_CONNECT_RETRY</entry> - </row> - <row> - <entry>MASTER_HOST</entry> - <entry>MASTER_LOG_FILE</entry> - <entry>MASTER_LOG_POS</entry> - </row> - <row> - <entry>MASTER_PASSWORD</entry> - <entry>MASTER_PORT</entry> - <entry>MASTER_SERVER_ID</entry> - </row> - <row> - <entry>MASTER_SSL</entry> - <entry>MASTER_SSL_CA</entry> - <entry>MASTER_SSL_CAPATH</entry> - </row> - <row> - <entry>MASTER_SSL_CERT</entry> - <entry>MASTER_SSL_CIPHER</entry> - <entry>MASTER_SSL_KEY</entry> - </row> - <row> - <entry>MASTER_USER</entry> <entry>MATCH</entry> - <entry>MAXVALUE</entry> + <entry>MEDIUMBLOB</entry> </row> <row> - <entry>MAX_CONNECTIONS_PER_HOUR</entry> - <entry>MAX_QUERIES_PER_HOUR</entry> - <entry>MAX_ROWS</entry> - </row> - <row> - <entry>MAX_UPDATES_PER_HOUR</entry> - <entry>MAX_USER_CONNECTIONS</entry> - <entry>MEDIUM</entry> - </row> - <row> - <entry>MEDIUMBLOB</entry> <entry>MEDIUMINT</entry> <entry>MEDIUMTEXT</entry> - </row> - <row> - <entry>MERGE</entry> - <entry>MICROSECOND</entry> <entry>MIDDLEINT</entry> </row> <row> - <entry>MIGRATE</entry> - <entry>MINUTE</entry> <entry>MINUTE_MICROSECOND</entry> - </row> - <row> <entry>MINUTE_SECOND</entry> - <entry>MIN_ROWS</entry> <entry>MOD</entry> </row> <row> - <entry>MODE</entry> <entry>MODIFIES</entry> - <entry>MODIFY</entry> - </row> - <row> - <entry>MONTH</entry> - <entry>MULTILINESTRING</entry> - <entry>MULTIPOINT</entry> - </row> - <row> - <entry>MULTIPOLYGON</entry> - <entry>MUTEX</entry> - <entry>NAME</entry> - </row> - <row> - <entry>NAMES</entry> - <entry>NATIONAL</entry> <entry>NATURAL</entry> - </row> - <row> - <entry>NCHAR</entry> - <entry>NDB</entry> - <entry>NDBCLUSTER</entry> - </row> - <row> - <entry>NEW</entry> - <entry>NEXT</entry> - <entry>NO</entry> - </row> - <row> - <entry>NODEGROUP</entry> - <entry>NONE</entry> <entry>NOT</entry> </row> <row> @@ -496,17 +241,7 @@ <entry>NUMERIC</entry> </row> <row> - <entry>NVARCHAR</entry> - <entry>OFFSET</entry> - <entry>OLD_PASSWORD</entry> - </row> - <row> <entry>ON</entry> - <entry>ONE</entry> - <entry>ONE_SHOT</entry> - </row> - <row> - <entry>OPEN</entry> <entry>OPTIMIZE</entry> <entry>OPTION</entry> </row> @@ -521,231 +256,81 @@ <entry>OUTFILE</entry> </row> <row> - <entry>PACK_KEYS</entry> - <entry>PARSER</entry> - <entry>PARTIAL</entry> - </row> - <row> - <entry>PARTITION</entry> - <entry>PARTITIONS</entry> - <entry>PASSWORD</entry> - </row> - <row> - <entry>PHASE</entry> - <entry>PLUGIN</entry> - <entry>POINT</entry> - </row> - <row> - <entry>POLYGON</entry> <entry>PRECISION</entry> - <entry>PREPARE</entry> - </row> - <row> - <entry>PREV</entry> <entry>PRIMARY</entry> - <entry>PRIVILEGES</entry> - </row> - <row> <entry>PROCEDURE</entry> - <entry>PROCESSLIST</entry> - <entry>PURGE</entry> </row> <row> - <entry>QUARTER</entry> - <entry>QUERY</entry> - <entry>QUICK</entry> - </row> - <row> + <entry>PURGE</entry> <entry>RAID0</entry> - <entry>RAID_CHUNKS</entry> - <entry>RAID_CHUNKSIZE</entry> - </row> - <row> - <entry>RAID_TYPE</entry> <entry>RANGE</entry> - <entry>READ</entry> </row> <row> + <entry>READ</entry> <entry>READS</entry> <entry>REAL</entry> - <entry>RECOVER</entry> </row> <row> - <entry>REDUNDANT</entry> <entry>REFERENCES</entry> <entry>REGEXP</entry> - </row> - <row> - <entry>RELAY_LOG_FILE</entry> - <entry>RELAY_LOG_POS</entry> - <entry>RELAY_THREAD</entry> - </row> - <row> <entry>RELEASE</entry> - <entry>RELOAD</entry> - <entry>RENAME</entry> </row> <row> - <entry>REORGANISE</entry> - <entry>REPAIR</entry> + <entry>RENAME</entry> <entry>REPEAT</entry> - </row> - <row> - <entry>REPEATABLE</entry> <entry>REPLACE</entry> - <entry>REPLICATION</entry> </row> <row> <entry>REQUIRE</entry> - <entry>RESET</entry> - <entry>RESTORE</entry> - </row> - <row> <entry>RESTRICT</entry> - <entry>RESUME</entry> <entry>RETURN</entry> </row> <row> - <entry>RETURNS</entry> <entry>REVOKE</entry> <entry>RIGHT</entry> - </row> - <row> <entry>RLIKE</entry> - <entry>ROLLBACK</entry> - <entry>ROLLUP</entry> </row> <row> - <entry>ROUTINE</entry> - <entry>ROW</entry> - <entry>ROWS</entry> - </row> - <row> - <entry>ROW_FORMAT</entry> - <entry>RTREE</entry> - <entry>SAVEPOINT</entry> - </row> - <row> <entry>SCHEMA</entry> <entry>SCHEMAS</entry> - <entry>SECOND</entry> - </row> - <row> <entry>SECOND_MICROSECOND</entry> - <entry>SECURITY</entry> - <entry>SELECT</entry> </row> <row> + <entry>SELECT</entry> <entry>SENSITIVE</entry> <entry>SEPARATOR</entry> - <entry>SERIAL</entry> </row> <row> - <entry>SERIALIZABLE</entry> - <entry>SESSION</entry> <entry>SET</entry> - </row> - <row> - <entry>SHARE</entry> <entry>SHOW</entry> - <entry>SHUTDOWN</entry> - </row> - <row> - <entry>SIGNED</entry> - <entry>SIMPLE</entry> - <entry>SLAVE</entry> - </row> - <row> <entry>SMALLINT</entry> - <entry>SNAPSHOT</entry> - <entry>SOME</entry> </row> <row> - <entry>SONAME</entry> - <entry>SOUNDS</entry> <entry>SPATIAL</entry> - </row> - <row> <entry>SPECIFIC</entry> <entry>SQL</entry> - <entry>SQLEXCEPTION</entry> </row> <row> + <entry>SQLEXCEPTION</entry> <entry>SQLSTATE</entry> <entry>SQLWARNING</entry> - <entry>SQL_BIG_RESULT</entry> </row> <row> - <entry>SQL_BUFFER_RESULT</entry> - <entry>SQL_CACHE</entry> + <entry>SQL_BIG_RESULT</entry> <entry>SQL_CALC_FOUND_ROWS</entry> - </row> - <row> - <entry>SQL_NO_CACHE</entry> <entry>SQL_SMALL_RESULT</entry> - <entry>SQL_THREAD</entry> </row> <row> - <entry>SQL_TSI_DAY</entry> - <entry>SQL_TSI_FRAC_SECOND</entry> - <entry>SQL_TSI_HOUR</entry> - </row> - <row> - <entry>SQL_TSI_MINUTE</entry> - <entry>SQL_TSI_MONTH</entry> - <entry>SQL_TSI_QUARTER</entry> - </row> - <row> - <entry>SQL_TSI_SECOND</entry> - <entry>SQL_TSI_WEEK</entry> - <entry>SQL_TSI_YEAR</entry> - </row> - <row> <entry>SSL</entry> - <entry>START</entry> <entry>STARTING</entry> - </row> - <row> - <entry>STATUS</entry> - <entry>STOP</entry> - <entry>STORAGE</entry> - </row> - <row> <entry>STRAIGHT_JOIN</entry> - <entry>STRING</entry> - <entry>STRIPED</entry> </row> <row> - <entry>SUBJECT</entry> - <entry>SUBPARTITION</entry> - <entry>SUBPARTITIONS</entry> - </row> - <row> - <entry>SUPER</entry> - <entry>SUSPEND</entry> <entry>TABLE</entry> - </row> - <row> - <entry>TABLES</entry> - <entry>TABLESPACE</entry> - <entry>TEMPORARY</entry> - </row> - <row> - <entry>TEMPTABLE</entry> <entry>TERMINATED</entry> - <entry>TEXT</entry> - </row> - <row> - <entry>THAN</entry> <entry>THEN</entry> - <entry>TIME</entry> </row> <row> - <entry>TIMESTAMP</entry> - <entry>TIMESTAMPADD</entry> - <entry>TIMESTAMPDIFF</entry> - </row> - <row> <entry>TINYBLOB</entry> <entry>TINYINT</entry> <entry>TINYTEXT</entry> @@ -753,92 +338,52 @@ <row> <entry>TO</entry> <entry>TRAILING</entry> - <entry>TRANSACTION</entry> - </row> - <row> <entry>TRIGGER</entry> - <entry>TRIGGERS</entry> - <entry>TRUE</entry> </row> <row> - <entry>TRUNCATE</entry> - <entry>TYPE</entry> - <entry>TYPES</entry> - </row> - <row> - <entry>UNCOMMITTED</entry> - <entry>UNDEFINED</entry> + <entry>TRUE</entry> <entry>UNDO</entry> - </row> - <row> - <entry>UNICODE</entry> - <entry>UNINSTALL</entry> <entry>UNION</entry> </row> <row> <entry>UNIQUE</entry> - <entry>UNKNOWN</entry> <entry>UNLOCK</entry> - </row> - <row> <entry>UNSIGNED</entry> - <entry>UNTIL</entry> - <entry>UPDATE</entry> </row> <row> + <entry>UPDATE</entry> <entry>USAGE</entry> <entry>USE</entry> - <entry>USER</entry> </row> <row> - <entry>USER_RESOURCES</entry> - <entry>USE_FRM</entry> <entry>USING</entry> - </row> - <row> <entry>UTC_DATE</entry> <entry>UTC_TIME</entry> - <entry>UTC_TIMESTAMP</entry> </row> <row> - <entry>VALUE</entry> + <entry>UTC_TIMESTAMP</entry> <entry>VALUES</entry> <entry>VARBINARY</entry> </row> <row> <entry>VARCHAR</entry> <entry>VARCHARACTER</entry> - <entry>VARIABLES</entry> - </row> - <row> <entry>VARYING</entry> - <entry>VIEW</entry> - <entry>WARNINGS</entry> </row> <row> - <entry>WEEK</entry> <entry>WHEN</entry> <entry>WHERE</entry> - </row> - <row> <entry>WHILE</entry> - <entry>WITH</entry> - <entry>WORK</entry> </row> <row> + <entry>WITH</entry> <entry>WRITE</entry> <entry>X509</entry> - <entry>XA</entry> </row> <row> <entry>XOR</entry> - <entry>YEAR</entry> <entry>YEAR_MONTH</entry> - </row> - <row> <entry>ZEROFILL</entry> - <entry></entry> - <entry></entry> </row> </tbody> </tgroup> Modified: trunk/tools/update-reserved-words.pl =================================================================== --- trunk/tools/update-reserved-words.pl 2005-11-10 17:35:35 UTC (rev 310) +++ trunk/tools/update-reserved-words.pl 2005-11-10 20:32:12 UTC (rev 311) @@ -19,6 +19,10 @@ # 2005-10-09 # - Comment out bk commands because BitKeeper is no longer used for the # mysqldoc repository. +# 2005-11-10 +# - For sql_yacc.yy in 5.0 and up, keyword: definition includes keyword_sp. +# Treat the words in keyword_sp: list the same as those in the keyword: +# list (not reserved). # Method of operation: @@ -110,7 +114,7 @@ my $line; print STDERR "Scanning $lexfile for symbols..\n"; -open LEX, "<$lexfile"; +open LEX, "<$lexfile" or die "Cannot open $lexfile: $!\n"; while(<LEX>) { # Identify lines that have keyword string and keyword token. # Build hash keyed on tokens. Hash value for each key is the @@ -123,10 +127,20 @@ }; close LEX; +# sql_yacc.yy has a keyword: production that lists non-reserved words. +# In 5.0 and up, this production also includes the keyword_sp: production, +# so look for them both. + print STDERR "Scanning $yaccfile for non-reserved words...\n"; -open YACC, "<$yaccfile"; -while(<YACC> !~ /^keyword:/) {}; -while(<YACC> =~ /[\s|]+([A-Z_]+)/) { +open YACC, "<$yaccfile" or die "Cannot open $yaccfile: $!\n"; +while(defined ($_ = <YACC>) && $_ !~ /^keyword:/) {}; +while(<YACC>) { + last unless /[\s|]+([A-Z_]+)/ || /keyword_sp/; + delete $words{$1} unless /keyword_sp/; +}; +while(defined ($_ = <YACC>) && $_ !~ /^keyword_sp:/) {}; +while(<YACC>) { + last unless /[\s|]+([A-Z_]+)/; delete $words{$1}; }; close YACC;
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r311 - in trunk: . refman-5.0 refman-5.1 tools | paul | 10 Nov |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.930 sec. using MySQL 5.1.14-beta-log