From: Date: August 12 2005 5:06am Subject: bk commit - mysqldoc@docsrva tree (paul:1.3255) List-Archive: http://lists.mysql.com/internals/28207 Message-Id: <20050812030650.04A6D350D35@frost.snake.net> 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.3255 05/08/11 22:06:42 paul@stripped +5 -0 Document SLEEP() function. refman/functions.xml 1.23 05/08/11 22:06:39 paul@stripped +34 -13 Document SLEEP() function. refman-common/news-5.0.xml 1.32 05/08/11 22:06:38 paul@stripped +7 -0 Document SLEEP() function. refman-5.1/functions.xml 1.3 05/08/11 22:06:38 paul@stripped +35 -14 Sync. refman-5.0/functions.xml 1.4 05/08/11 22:06:38 paul@stripped +33 -12 Sync. refman-4.1/functions.xml 1.25 05/08/11 22:06:38 paul@stripped +145 -126 Sync. # 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: frost.snake.net # Root: /Volumes/frost2/MySQL/bk/mysqldoc --- 1.2/refman-5.1/functions.xml 2005-08-08 21:53:04 -05:00 +++ 1.3/refman-5.1/functions.xml 2005-08-11 22:06:38 -05:00 @@ -281,8 +281,8 @@ By default, string comparisons are not case sensitive and use - the current character set (ISO-8859-1 Latin1 by default, which - also works excellently for English). + the current character set (cp1252 Latin1 by default, which also + works excellently for English). @@ -2540,7 +2540,7 @@ Returns the string str with all characters changed to lowercase according to the current - character set mapping (the default is ISO-8859-1 Latin1). + character set mapping (the default is cp1252 Latin1). @@ -3439,7 +3439,7 @@ Returns the string str with all characters changed to uppercase according to the current - character set mapping (the default is ISO-8859-1 Latin1). + character set mapping (the default is cp1252 Latin1). @@ -3798,8 +3798,8 @@ REGEXP and RLIKE use - the current character set (ISO-8859-1 Latin1 by default) - when deciding the type of a character. + the current character set (cp1252 Latin1 by default) when + deciding the type of a character. Warning: These operators are not multi-byte safe. @@ -8387,8 +8387,8 @@ such as the or some that is so common that it is considered to have zero semantic value. There is a built-in stopword list, but it can be overwritten - by a user-defined list. - See . + by a user-defined list. See + . @@ -8973,10 +8973,12 @@ stopword list user-defined + fulltext stopword list + To override the default stopword list, set the ft_stopword_file system variable. (See .) The variable @@ -8986,15 +8988,15 @@ contents of the stopword file, rebuild your FULLTEXT indexes. + The stopword list is free-form, that is, you may use any - non-alphanumeric character such as newline, space, or comma - to separate stopwords. Exceptions are the underscore + non-alphanumeric character such as newline, space, or comma + to separate stopwords. Exceptions are the underscore character (_) and a single apostrophe (') which are treated as part of a word. The character set of the stopword list is the server's - default character set; - see . + default character set; see . @@ -11533,20 +11535,39 @@ with RELEASE_LOCK(). See . + - + + - UUID() + SLEEP() + + SLEEP(duration) + + + + Sleeps (pauses) for the number of seconds given by the + duration argument, then returns + 0. The duration may have a fractional part given in + microseconds. This function was added in MySQL 5.0.12. + + + + + + UUID() + + UUID() --- 1.31/refman-common/news-5.0.xml 2005-08-10 15:54:45 -05:00 +++ 1.32/refman-common/news-5.0.xml 2005-08-11 22:06:38 -05:00 @@ -175,6 +175,13 @@ + Added the SLEEP() function, which pauses + for the number of seconds given by its argument. (Bug #6760) + + + + + Trying to drop the default keycache by setting @@global.key_buffer_size to zero now returns a warning that the default keycache cannot be dropped. --- 1.24/refman-4.1/functions.xml 2005-08-11 15:03:06 -05:00 +++ 1.25/refman-4.1/functions.xml 2005-08-11 22:06:38 -05:00 @@ -188,10 +188,10 @@ Comparison operations result in a value of 1 - (TRUE), 0 - (FALSE), or NULL. These - operations work for both numbers and strings. Strings are - automatically converted to numbers and numbers to strings as + (TRUE), 0 + (FALSE), or NULL. These + operations work for both numbers and strings. Strings are + automatically converted to numbers and numbers to strings as necessary. @@ -272,8 +272,8 @@ By default, string comparisons are not case sensitive and use - the current character set (cp1252 Latin1 by default, which - also works excellently for English). + the current character set (cp1252 Latin1 by default, which also + works excellently for English). @@ -969,9 +969,9 @@ integers. It is required that N1 < N2 < N3 < ... - < Nn for - this function to work correctly. This is because a binary - search is used (very fast). + < Nn for this function to work + correctly. This is because a binary search is used (very + fast). @@ -1439,13 +1439,13 @@ expr3 is explicitly NULL, the result type of the IF() function is the type of - non-NULL expression. (This behavior was + non-NULL expression. (This behavior was implemented in MySQL 4.0.3.) - expr1 is evaluated as an integer - value, which means that if you are testing floating-point or + expr1 is evaluated as an integer + value, which means that if you are testing floating-point or string values, you should do so using a comparison operation. @@ -1482,21 +1482,18 @@ Return Value - expr2 or - expr3 returns a - string + expr2 or expr3 + returns a string string - expr2 or - expr3 returns a - floating-point value + expr2 or expr3 + returns a floating-point value floating-point - expr2 or - expr3 returns an - integer + expr2 or expr3 + returns an integer integer @@ -1504,9 +1501,9 @@ - If expr2 and - expr3 are both strings, the result - is case sensitive if either string is case sensitive (starting + If expr2 and + expr3 are both strings, the result + is case sensitive if either string is case sensitive (starting from MySQL 3.23.51). @@ -2439,8 +2436,8 @@ - If the file does not exist or cannot be read because one of - the preceding conditions is not satisfied, the function + If the file does not exist or cannot be read because one of + the preceding conditions is not satisfied, the function returns NULL. @@ -2811,10 +2808,10 @@ properly escaped data value in an SQL statement. The string is returned surrounded by single quotes and with each instance of single quote ('''), backslash - ('\'), ASCII NUL, and - Control-Z preceded by a backslash. If the argument is - NULL, the return value is the word - NULL without surrounding single quotes. The + ('\'), ASCII NUL, and + Control-Z preceded by a backslash. If the argument is + NULL, the return value is the word + NULL without surrounding single quotes. The QUOTE() function was added in MySQL 4.0.3. @@ -3542,8 +3539,8 @@ Pattern matching using SQL simple regular expression - comparison. Returns 1 - (TRUE) or 0 + comparison. Returns 1 + (TRUE) or 0 (FALSE). If either expr or pat is NULL, @@ -3594,8 +3591,8 @@ To test for literal instances of a wildcard character, - precede the character with the escape character. If you - do not specify the ESCAPE character, + precede the character with the escape character. If you do + not specify the ESCAPE character, '\' is assumed. @@ -3808,9 +3805,9 @@ REGEXP and RLIKE use - the current character set (cp1252 Latin1 by default) - when deciding the type of a character. However, these - operators are not multi-byte safe. + the current character set (cp1252 Latin1 by default) when + deciding the type of a character. However, these operators + are not multi-byte safe. @@ -3995,7 +3992,7 @@ - Note: If this operator is + Note: If this operator is used with a BIGINT, the return value is a BIGINT. This means that you should avoid using - on integers that may have the @@ -4796,7 +4793,7 @@ Returns the value of pi (π). The - default number of decimals displayed is five, but MySQL + default number of decimals displayed is five, but MySQL internally uses the full double-precision value. @@ -4916,7 +4913,7 @@ - You cannot use a column with RAND() + You cannot use a column with RAND() values in an ORDER BY clause, because ORDER BY would evaluate the column multiple times. As of MySQL 3.23, you can retrieve rows in @@ -4946,8 +4943,8 @@ RAND() is not meant to be a perfect - random generator, but instead is a fast way to generate - ad hoc random numbers that is portable + random generator, but instead is a fast way to generate + ad hoc random numbers that is portable between platforms for the same MySQL version. @@ -5003,7 +5000,7 @@ - The behavior of ROUND() when the argument + The behavior of ROUND() when the argument is halfway between two integers depends on the C library implementation. Different implementations round to the nearest even number, always up, always down, or always @@ -5653,7 +5650,8 @@ The INTERVAL keyword and the - type specifier are not case sensitive. + type specifier are not case + sensitive. @@ -7793,7 +7791,7 @@ the year that contains the first day of the week for the given date, you should use 0, 2, 5, or - 7 as the optional + 7 as the optional mode argument. @@ -7967,8 +7965,12 @@ - MySQL uses what is known as a proleptic Gregorian - calendar. + MySQL uses what is known as a + + proleptic Gregorian + calendar + + . @@ -8030,18 +8032,21 @@ There are no dates between October 4 and October 15. This - discontinuity is called the cutover. Any - dates before the cutover are Julian, and any dates following the - cutover are Gregorian. Dates during a cutover are nonexistent. + discontinuity is called the + + cutover + + . Any dates before the cutover are Julian, and any dates following + the cutover are Gregorian. Dates during a cutover are nonexistent. A calendar applied to dates when it was not actually in use is - called proleptic. Thus, if we assume there - was never a cutover and Gregorian rules always rule, we have a - proleptic Gregorian calendar. This is what is used by MySQL, as is - required by standard SQL. For this reason, dates prior to the - cutover stored as MySQL DATE or + called proleptic. Thus, if we assume there + was never a cutover and Gregorian rules always rule, we have a + proleptic Gregorian calendar. This is what is used by MySQL, as is + required by standard SQL. For this reason, dates prior to the + cutover stored as MySQL DATE or DATETIME values must be adjusted to compensate for the difference. It is important to realise that the cutover did not occur at the same time in all countries, and that the @@ -8049,7 +8054,7 @@ Britain, it took place in 1752, when Wednesday September 2 was followed by Thursday September 14; Russia remained on the Julian calendar until 1918, losing 13 days in the process, and what is - popularly referred to as its October Revolution + popularly referred to as its October Revolution occurred in November according to the Gregorian calendar. @@ -8105,7 +8110,7 @@ at CREATE TABLE time or added later with ALTER TABLE or CREATE INDEX. For large datasets, it is much faster to load - data into a table that has no FULLTEXT + data into a table that has no FULLTEXT index, then create the index with ALTER TABLE (or CREATE INDEX). Loading data into a table that has an existing @@ -8283,13 +8288,13 @@ The FULLTEXT parser determines where words start and end by looking for certain delimiters, for example ' ' (the space character), , - (the comma), and . (the period). If words - are not separated by delimiters, like for example Chinese words, - the FULLTEXT parser cannot determine where a - word starts and where it ends. To be able to add words or other - indexed terms in such languages to a FULLTEXT - index, you'd have to preprocess them so that they are separated by - some delimiter (for example, by ''). + (the comma), and . (the period). If words are + not separated by delimiters, like for example Chinese words, the + FULLTEXT parser cannot determine where a word + starts and where it ends. To be able to add words or other indexed + terms in such languages to a FULLTEXT index, + you'd have to preprocess them so that they are separated by some + delimiter (for example, by ''). @@ -8312,8 +8317,8 @@ such as the or some that is so common that it is considered to have zero semantic value. There is a built-in stopword list, but it can be overwritten - by a user-defined list. - See . + by a user-defined list. See + . @@ -8356,8 +8361,8 @@ The search result is empty because the word MySQL is present in at least 50% of the rows. As such, it is effectively treated as a stopword. For large datasets, this is the most - desirable behavior — a natural language query should not - return every second row from a 1GB table. For small datasets, it + desirable behavior — a natural language query should not + return every second row from a 1GB table. For small datasets, it may be less desirable. @@ -8543,10 +8548,10 @@ A leading tilde acts as a negation operator, causing the - word's contribution to the row relevance to be negative. - It is useful for marking noise words. A row - that contains such a word is rated lower than others, but is - not excluded altogether, as it would be by the + word's contribution to the row relevance to be negative. It + is useful for marking noise words. A row that + contains such a word is rated lower than others, but is not + excluded altogether, as it would be by the - operator. @@ -8574,13 +8579,12 @@ contain the phrase literally, as it was typed. The full-text engine splits the phrase into words, performs a search in the - FULLTEXT index for the words. The engine - then performs a substring search for the phrase in the - records that are found, so the match must include non-word - characters in the phrase. For example, - "test phrase" does - not match "test, - phrase". + FULLTEXT index for the words. The engine + then performs a substring search for the phrase in the + records that are found, so the match must include non-word + characters in the phrase. For example, "test + phrase" does not match + "test, phrase". @@ -8754,9 +8758,9 @@ - Note: Because blind query - expansion tends to increase noise significantly by returning - non-relevant documents, it is only meaningful to use when a + Note: Because blind query + expansion tends to increase noise significantly by returning + non-relevant documents, it is only meaningful to use when a search phrase is rather short. @@ -8786,7 +8790,7 @@ - Languages such as Chinese, Japanese, and so forth do not + Languages such as Chinese, Japanese, and so forth do not have word delimiters. You should be aware that the FULLTEXT parser cannot determine where a word starts and where it ends in these languages. @@ -8831,8 +8835,8 @@ The MySQL full-text search capability has few user-tunable - parameters. You can exert more control over full-text searching - behavior if you have a MySQL source distribution because some + parameters. You can exert more control over full-text searching + behavior if you have a MySQL source distribution because some changes require source code modifications. See . @@ -8840,7 +8844,7 @@ Note that full-text search was carefully tuned for the best searching effectiveness. Modifying the default behavior, in most - cases, makes the search results worse. Do not alter + cases, makes the search results worse. Do not alter the MySQL sources unless you know what you are doing. @@ -8894,10 +8898,12 @@ stopword list user-defined + fulltext stopword list + To override the default stopword list, set the ft_stopword_file system variable (available as of MySQL 4.0.10). See @@ -8908,15 +8914,15 @@ contents of the stopword file, rebuild your FULLTEXT indexes. + The stopword list is free-form, that is, you may use any - non-alphanumeric character such as newline, space, or comma - to separate stopwords. Exceptions are the underscore + non-alphanumeric character such as newline, space, or comma + to separate stopwords. Exceptions are the underscore character (_) and a single apostrophe (') which are treated as part of a word. The character set of the stopword list is the server's - default character set; - see . + default character set; see . @@ -8974,7 +8980,7 @@ ft_stopword_file), or if you change the stopword file itself, you must rebuild your FULLTEXT indexes after making the changes and - restarting the server. To rebuild the indexes in this case, it + restarting the server. To rebuild the indexes in this case, it is sufficient to do a QUICK repair operation: @@ -8985,8 +8991,8 @@ With regard specifically to using the IN BOOLEAN MODE capability, if you upgrade from MySQL 3.23 to 4.0 - or later, it is necessary to replace the index header as well. - To do this, perform a USE_FRM repair + or later, it is necessary to replace the index header as well. + To do this, perform a USE_FRM repair operation: @@ -9130,9 +9136,9 @@ BINARY was added in MySQL 3.23.0. As of - MySQL 4.0.2, BINARY + MySQL 4.0.2, BINARY str is a shorthand for - CAST(str AS + CAST(str AS BINARY). @@ -9438,8 +9444,8 @@ The handing of unsigned values was changed in MySQL 4.0 to be able to support BIGINT values properly. If you have some code that you want to run in both MySQL 4.0 and 3.23, you - probably cannot use the CAST() function. You can - use the following technique to get a signed result when + probably cannot use the CAST() function. You + can use the following technique to get a signed result when subtracting two unsigned integer columns ucol1 and ucol2: @@ -9936,8 +9942,8 @@ - If the crypt_str argument does not - look like an encrypted string, MySQL returns the given + If the crypt_str argument does + not look like an encrypted string, MySQL returns the given crypt_str. @@ -10481,8 +10487,8 @@ - Before MySQL 4.1.11, the return values are shown as follows, - and functions such as USER() have a + Before MySQL 4.1.11, the return values are shown as follows, + and functions such as USER() have a coercibility of 2: @@ -10645,8 +10651,8 @@ CURRENT_USER() was added in MySQL 4.0.6. - As of MySQL 4.1.0, the string has the utf8 - character set. + As of MySQL 4.1.0, the string has the + utf8 character set. @@ -10730,7 +10736,7 @@ indicating how many rows the first SELECT would have returned had it been written without the LIMIT clause. (If the preceding - SELECT statement does not include + SELECT statement does not include SQL_CALC_FOUND_ROWS, then FOUND_ROWS() may return a different result when LIMIT is used than when it is @@ -10741,7 +10747,7 @@ Note that if you are using SELECT SQL_CALC_FOUND_ROWS, MySQL must calculate how many rows are in the full result set. However, this is faster - than running the query again without + than running the query again without LIMIT, because the result set need not be sent to the client. @@ -10848,14 +10854,14 @@ The last ID that was generated is maintained in the server - on a per-connection basis. This means - that the value which the function returns to a given client - is the most recent AUTO_INCREMENT value - generated by that client. The value cannot be affected by - other clients, even if they generate - AUTO_INCREMENT values of their own. This - behavior ensures that you can retrieve your own ID without - concern for the activity of other clients, and without the + on a per-connection basis. This means + that the value which the function returns to a given client + is the most recent AUTO_INCREMENT value + generated by that client. The value cannot be affected by + other clients, even if they generate + AUTO_INCREMENT values of their own. This + behavior ensures that you can retrieve your own ID without + concern for the activity of other clients, and without the need for locks or transactions. @@ -10881,8 +10887,8 @@ is ignored, the AUTO_INCREMENT counter is not incremented and LAST_INSERT_ID() returns 0, which reflects that no record was inserted. - (Before MySQL 4.1, the AUTO_INCREMENT - counter is still incremented and + (Before MySQL 4.1, the AUTO_INCREMENT + counter is still incremented and LAST_INSERT_ID() returns the new value.) @@ -11485,20 +11491,39 @@ with RELEASE_LOCK(). See . + - + + - UUID() + SLEEP() + + SLEEP(duration) + + + + Sleeps (pauses) for the number of seconds given by the + duration argument, then returns + 0. The duration may have a fractional part given in + microseconds. This function was added in MySQL 5.0.12. + + + + + + UUID() + + UUID() @@ -12040,19 +12065,17 @@ - - SUM() - + SUM(expr) @@ -12064,12 +12087,9 @@ - - - VARIANCE() @@ -12140,7 +12160,6 @@ ('Phone', 'Finland', 2001, 10); --> - As of MySQL 4.1.1, the GROUP BY clause allows a WITH ROLLUP modifier that causes extra rows @@ -12445,8 +12464,8 @@ In standard SQL, you would have to add customer.name to the GROUP - BY clause. In MySQL, the name is redundant if you - do not run in ANSI mode. + BY clause. In MySQL, the name is redundant if you do + not run in ANSI mode. --- 1.22/refman/functions.xml 2005-08-08 21:53:12 -05:00 +++ 1.23/refman/functions.xml 2005-08-11 22:06:39 -05:00 @@ -281,8 +281,8 @@ By default, string comparisons are not case sensitive and use - the current character set (cp1252 Latin1 by default, which - also works excellently for English). + the current character set (cp1252 Latin1 by default, which also + works excellently for English). @@ -3870,9 +3870,9 @@ REGEXP and RLIKE use - the current character set (cp1252 Latin1 by default) - when deciding the type of a character. However, these - operators are not multi-byte safe. + the current character set (cp1252 Latin1 by default) when + deciding the type of a character. However, these operators + are not multi-byte safe. @@ -8549,8 +8549,8 @@ such as the or some that is so common that it is considered to have zero semantic value. There is a built-in stopword list, but it can be overwritten - by a user-defined list. - See . + by a user-defined list. See + . @@ -9138,10 +9138,12 @@ stopword list user-defined + fulltext stopword list + To override the default stopword list, set the ft_stopword_file system variable (available as of MySQL 4.0.10). See @@ -9152,15 +9154,15 @@ contents of the stopword file, rebuild your FULLTEXT indexes. + The stopword list is free-form, that is, you may use any - non-alphanumeric character such as newline, space, or comma - to separate stopwords. Exceptions are the underscore + non-alphanumeric character such as newline, space, or comma + to separate stopwords. Exceptions are the underscore character (_) and a single apostrophe (') which are treated as part of a word. The character set of the stopword list is the server's - default character set; - see . + default character set; see . @@ -11866,20 +11868,39 @@ with RELEASE_LOCK(). See . + - + + - UUID() + SLEEP() + + SLEEP(duration) + + + + Sleeps (pauses) for the number of seconds given by the + duration argument, then returns + 0. The duration may have a fractional part given in + microseconds. This function was added in MySQL 5.0.12. + + + + + + UUID() + + UUID() --- 1.3/refman-5.0/functions.xml 2005-08-08 21:52:59 -05:00 +++ 1.4/refman-5.0/functions.xml 2005-08-11 22:06:38 -05:00 @@ -281,8 +281,8 @@ By default, string comparisons are not case sensitive and use - the current character set (cp1252 Latin1 by default, which - also works excellently for English). + the current character set (cp1252 Latin1 by default, which also + works excellently for English). @@ -3798,8 +3798,8 @@ REGEXP and RLIKE use - the current character set (ISO-8859-1 Latin1 by default) - when deciding the type of a character. + the current character set (cp1252 Latin1 by default) when + deciding the type of a character. Warning: These operators are not multi-byte safe. @@ -8387,8 +8387,8 @@ such as the or some that is so common that it is considered to have zero semantic value. There is a built-in stopword list, but it can be overwritten - by a user-defined list. - See . + by a user-defined list. See + . @@ -8973,10 +8973,12 @@ stopword list user-defined + fulltext stopword list + To override the default stopword list, set the ft_stopword_file system variable. (See .) The variable @@ -8986,15 +8988,15 @@ contents of the stopword file, rebuild your FULLTEXT indexes. + The stopword list is free-form, that is, you may use any - non-alphanumeric character such as newline, space, or comma - to separate stopwords. Exceptions are the underscore + non-alphanumeric character such as newline, space, or comma + to separate stopwords. Exceptions are the underscore character (_) and a single apostrophe (') which are treated as part of a word. The character set of the stopword list is the server's - default character set; - see . + default character set; see . @@ -11533,20 +11535,39 @@ with RELEASE_LOCK(). See . + - + + - UUID() + SLEEP() + + SLEEP(duration) + + + + Sleeps (pauses) for the number of seconds given by the + duration argument, then returns + 0. The duration may have a fractional part given in + microseconds. This function was added in MySQL 5.0.12. + + + + + + UUID() + + UUID()