===== manual.texi 1.2296 vs edited ===== --- 1.2296/Docs/manual.texi 2004-12-30 21:11:47 +01:00 +++ edited/manual.texi 2005-01-03 15:46:06 +01:00 @@ -3028,7 +3028,7 @@ Before MySQL 5.0.2, MySQL is forgiving of illegal or improper data values and coerces them to legal values for data entry. In MySQL 5.0.2 and up, that remains the default behavior, but you can select more traditional -treatment of bad values such that the server rejects them and aborts the +treatment of bad values such that the server rejects them and aborts the statement in which they occur. This section describes the default (forgiving) behavior of MySQL, as well as the newer strict SQL mode and how it differs. @@ -3169,7 +3169,7 @@ Errors for invalid values can be suppressed in strict mode if you use @code{INSERT IGNORE} or @code{UPDATE IGNORE}. In this case, a warning is generated rather than an error. For @code{ENUM}, the value is inserted as the -error member (@code{0}). For @code{SET}, the value is inserted as given except that +error member (@code{0}). For @code{SET}, the value is inserted as given except that any invalid substrings are deleted. For example, @code{'a,x,b,y'} results in a value of @code{'a,b'}, as described earlier. @@ -6041,7 +6041,7 @@ The name changes were not both instituted at the same time. If you have MySQL 4.1.2 or 4.1.3, it might be that you have a server named @command{mysqld-debug} but not one named @command{mysqld}. In this -case, you should have have a server @command{mysqld-opt}, which you +case, you should have a server @command{mysqld-opt}, which you should choose as your default server unless you need maximal features, named pipes, or debugging support. @@ -11681,7 +11681,7 @@ @item In 5.0.1, the view-related privileges are not enabled for any accounts, so -you cannot immediately use @code{GRANT} to give them give them to accounts +you cannot immediately use @code{GRANT} to give them to accounts that should have them. To deal with this, first connect to the server as @code{root} and issue the following statements to give the privileges to the @code{root} accounts manually with @code{UPDATE}: @@ -13717,7 +13717,7 @@ is 2GB. We have been able to compile MySQL with the following @command{configure} -command on on OpenServer with @command{gcc} 2.95.3. +command on OpenServer with @command{gcc} 2.95.3. @example CC=gcc CXX=gcc ./configure --prefix=/usr/local/mysql \ @@ -23800,7 +23800,7 @@ The @code{host} table is not affected by the @code{GRANT} or @code{REVOKE} statements, so it is unused in most MySQL installations. If you modify -it directly, you can use it for some specialized purposes, such as to to +it directly, you can use it for some specialized purposes, such as to maintain a list of secure servers. For example, at TcX, the @code{host} table contains a list of all machines on the local network. These are granted all privileges. @@ -26569,7 +26569,7 @@ Maximum length of the data file (when re-creating data file when it's ``full''). @item --extend-check, -e -Do a repair that tries to +Do a repair that tries to recover every possible row from the data file. Normally this will also find a lot of garbage rows. Don't use this option unless you are totally desperate. @@ -29115,7 +29115,7 @@ @end example To start a second server, provide different @code{--socket} and -@code{--port} option values, and pass a a @code{--datadir=@var{path}} option to +@code{--port} option values, and pass a @code{--datadir=@var{path}} option to @command{mysqld_safe} so that the server uses a different data directory. Another way to achieve a similar effect is to use environment variables @@ -30799,7 +30799,7 @@ setup will work only if you perform no conflicting updates between the tables. In other words, if you insert data in both A and C, you should never insert a row in A that may have a key that -conflicts with with a row inserted in C. You should also not update +conflicts with a row inserted in C. You should also not update the same rows on two servers if the order in which the updates are applied is significant. @@ -31254,7 +31254,7 @@ option also applies to database-level statements (@code{CREATE DATABASE}, @code{DROP DATABASE}, and @code{ALTER DATABASE}). For example, if you use @code{--replicate-wild-do-table=foo%.%}, -database-level statements statements are replicated +database-level statements are replicated if the database name matches the pattern @code{foo%}. To include literal wildcard characters in the database or table name @@ -33415,7 +33415,7 @@ @item A constant from the query string @item -A column of a @code{const} or @code{system} table from the the same join +A column of a @code{const} or @code{system} table from the same join @item The result of an uncorrelated subquery @item @@ -44074,7 +44074,7 @@ binary collation for the character set. The binary collation is not case sensitive. -Character column sorting and comparison are are based on the character set +Character column sorting and comparison are based on the character set assigned to the column. Before MySQL 4.1, sorting and comparison are based on the collation of the server character set. For @code{CHAR} and @code{VARCHAR} columns, you can declare the column with the @code{BINARY} @@ -52691,7 +52691,7 @@ @end example The second @code{HANDLER ... READ} syntax fetches a row from the table in -index order that that matches @code{WHERE} condition. +index order that matches @code{WHERE} condition. The third @code{HANDLER ... READ} syntax fetches a row from the table in natural row order that matches the @code{WHERE} condition. It is faster than @@ -53640,7 +53640,7 @@ file containing such lines, specify a @code{LINES TERMINATED BY '\r\n'} clause. -To read a file containing jokes that are separated by lines consisting of +To read a file containing jokes that are separated by lines consisting of @code{%%}, you can do this @example @@ -56752,7 +56752,7 @@ If the column cannot take @code{NOT NULL} as the value, MySQL defines the column with no explicit @code{DEFAULT} clause. For data entry, if an @code{INSERT} or @code{REPLACE} statement includes no value for the column, -MySQL handles the column according to to the SQL mode in effect at the time: +MySQL handles the column according to the SQL mode in effect at the time: @itemize @bullet @@ -56878,7 +56878,7 @@ @code{TYPE type_name} can be used as a synonym for @code{USING type_name} to specify an index type. However, @code{USING} is the preferred form. -Also, the index name name that precedes the index type in the index +Also, the index name that precedes the index type in the index specification syntax is not optional with @code{TYPE}. This is because, unlike @code{USING}, @code{TYPE} is not a reserved word and thus is interpreted as an index name. @@ -57640,7 +57640,7 @@ @item The statement doesn't end a running transaction. @item -No access rights are checked. (A @code{TEMPORARY} table is visible only +No access rights are checked. (A @code{TEMPORARY} table is visible only to the client that created it, so no check is necessary.) @end itemize @@ -57777,7 +57777,7 @@ The @code{Key} column indicates whether the field is indexed. A value of @code{PRI} indicates that the field is part of the table's primary key. @code{UNI} indicates that -the field is part of a a @code{UNIQUE} index. The @code{MUL} value +the field is part of a @code{UNIQUE} index. The @code{MUL} value indicates that multiple occurences of a given value allowed within the field. A field can be designated as @code{MUL} even if a @code{UNIQUE} index is used if @@ -62059,7 +62059,7 @@ @item Master_SSL_Allowed, Master_SSL_CA_File, Master_SSL_CA_Path, Master_SSL_Cert, Master_SSL_Cipher, Master_SSL_Key -These fields show the +These fields show the SSL parameters used by the slave to connect to the master, if any. @code{Master_SSL_Allowed} has these values: @@ -62567,7 +62567,7 @@ but the slave servers use only non-transactional storage engines for greater speed.) -This automatic automatic substitution of the @code{MyISAM} table type when an +This automatic substitution of the @code{MyISAM} table type when an unavailable type is specified can be confusing for new MySQL users. In MySQL 4.1 and up, a warning is generated when a table type is automatically changed. @@ -63229,7 +63229,7 @@ this is happening. The most important thing to know is whether the table became corrupted as a result of a server crash. You can verify this easily by looking for a recent @code{restarted mysqld} message in the error log. -If there is such a message, it is likely that that table corruption is a +If there is such a message, it is likely that table corruption is a result of the server dying. Otherwise, corruption may have occurred during normal operation, which is a bug. You should try to create a reproducible test case that demonstrates the problem. @@ -66107,7 +66107,7 @@ innodb_data_file_path = /ibdata/ibdata1:10M:autoextend @end example -Suppose that that this data file, over time, has grown to 988MB. Below is the +Suppose that this data file, over time, has grown to 988MB. Below is the configuration line after adding another auto-extending data file. @example @@ -69519,7 +69519,7 @@ uniqueness constraints in the general case. An important point for both @code{IndexMemory} and @code{DataMemory} is -that the total database size is the the sum of all @code{DataMemory} and +that the total database size is the sum of all @code{DataMemory} and @code{IndexMemory} in each node group. Each node group is used to store replicated information, so if there are four nodes with 2 replicas there will be two node groups and thus the total @code{DataMemory} available is @@ -71460,7 +71460,7 @@ necessary to build the SCI Socket libraries. Second the SCI Socket kernel libraries need to be installed. Third one or two configuration files needs to be installed. -At last the the SCI Socket kernel library needs to be enabled either for the +At last the SCI Socket kernel library needs to be enabled either for the entire machine or for the shell where the MySQL Cluster processes are started from. This process needs to be repeated for each machine in cluster which will use SCI Sockets to communicate. @@ -73594,7 +73594,7 @@ @c description_for_help_topic MULTILINESTRING @item MultiLineString(@var{ls1},@var{ls2},...) @findex MultiLineString() -Constructs a WKB @code{MultiLineString} value using using WKB @code{LineString} +Constructs a WKB @code{MultiLineString} value using WKB @code{LineString} arguments. If any argument is not a WKB @code{LineString}, the return value is @code{NULL}. @c end_description_for_help_topic @@ -75477,7 +75477,7 @@ @code{DECLARE} may be used only inside a @code{BEGIN ... END} compound statement and must be at its start, before any other statements. -Cursors must be declared before declaring handlers, and variables must be +Cursors must be declared before declaring handlers, and variables must be declared before declaring either cursors or handlers. @@ -75674,7 +75674,7 @@ Asensitive means that the server may or may not make a copy of its result table. -Cursors must be declared before declaring handlers, and variables must be +Cursors must be declared before declaring handlers, and variables must be declared before declaring either cursors or handlers. For example: @@ -83503,7 +83503,7 @@ @item Edit @file{Makefile} to specify the correct path for the MySQL client -libraries and headers files. Then use use the following commands to build +libraries and headers files. Then use the following commands to build and install the release version: @example @@ -84484,7 +84484,7 @@ setting @code{option} to 12 (4+8) gives you debugging without packet limits. The default @file{myodbc3.dll} is compiled for optimal performance. If you -want to to debug MyODBC 3.51 (for example, to enable tracing), you should +want to debug MyODBC 3.51 (for example, to enable tracing), you should instead use @file{myodbc3d.dll}. To install this file, copy @file{myodbc3d.dll} over the installed @file{myodbc3.dll} file. Make sure to revert back to the release version of the driver DLL once you are done with @@ -88679,7 +88679,7 @@ Before MySQL 4.1, @command{mysql-test-run} does not try to run its own server by default but tries to use your currently running server. To override this -and cause @command{mysql-test-run} to start its own server, run it with with +and cause @command{mysql-test-run} to start its own server, run it with the @code{--local} option. You can run one individual test case with @@ -90166,7 +90166,7 @@ @appendixsubsec @code{Too many connections} If you get a @code{Too many connections} error when you try to connect to the -@command{mysqld} server, this means that that all available connections already +@command{mysqld} server, this means that all available connections already are used by other clients. The number of connections allowed is controlled by the @code{max_connections} @@ -93014,7 +93014,7 @@ The following is a list of some of the tools we have used to create MySQL. We use this to express our thanks to those that has created them as without -these we could not have made MySQL what is is today. +these we could not have made MySQL what it is today. @table @asis @item Free Software Foundation @@ -108410,7 +108410,7 @@ @item Cluster will automatically configure shared memory transporter if possible. @item Cluster will prioritize usage of transporters with shared memory and localhost TCP -@item Added swtiches to to control the above fucntions, @code{ndb-shm} and +@item Added switches to control the above functions, @code{ndb-shm} and @code{ndb-optimized-node-selection}. @end itemize