Skip to content

M
mariadb
Commit 15e265ec authored by unknown's avatar unknown
Browse files
Options

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
parents 7aab8d6d 145f25bd
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 106 deletions
Docs/manual.texi
View file @ 15e265ec
......@@ -1635,14 +1635,6 @@ server.
Contact us at @email{trademark@@mysql.com} to inquire about special
arrangements to fit your needs.
@menu
* When need MySQL logo permission::
* MySQL AB Partnership Logos::
* Using MySQL word in presentations::
* Using MySQL word in company and product names::
@end menu
@node When need MySQL logo permission, MySQL AB Partnership Logos, MySQL Logos that may be Used Without Written Permission, MySQL AB Logos and Trademarks
@subsubsection When do you need a Written Permission to use MySQL Logos?
......@@ -3414,8 +3406,6 @@ and line terminator characters of more than 1 character.
The following problems are known and will be fixed in due time:
@itemize @bullet
@item
For the moment @code{MATCH} only works with @code{SELECT} statements.
@item
When using @code{SET CHARACTER SET}, one can't use translated
......@@ -5038,12 +5028,8 @@ For the Windows distribution, please see @ref{Windows installation}.
@cindex installing, binary distribution
@cindex binary distributions, installing
For the Windows distribution, please see @ref{Windows binary installation}.
@menu
* Linux-RPM:: Linux RPM files
* Building clients:: Building client programs
@end menu
See also @ref{Windows binary installation},
@ref{Linux-RPM}, and @ref{Building clients}.
You need the following tools to install a MySQL binary distribution:
......@@ -8731,12 +8717,7 @@ it with a trace file or under @code{gdb}. @xref{Using gdb on mysqld}.
* FreeBSD:: FreeBSD Notes
* NetBSD:: NetBSD notes
* OpenBSD:: OpenBSD Notes
* OpenBSD 2.5:: OpenBSD 2.5 Notes
* OpenBSD 2.8:: OpenBSD 2.8 Notes
* BSDI:: BSD/OS Notes
* BSDI2:: BSD/OS Version 2.x Notes
* BSDI3:: BSD/OS Version 3.x Notes
* BSDI4:: BSD/OS Version 4.x Notes
@end menu
......@@ -8844,7 +8825,7 @@ crash when @code{make} tries to run @code{lint} on C++ files.
This section contains notes on OpenBSD.
@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes
@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, OpenBSD
@subsubsection OpenBSD 2.5 Notes
On OpenBSD Version 2.5, you can compile MySQL with native threads
......@@ -8855,7 +8836,7 @@ CFLAGS=-pthread CXXFLAGS=-pthread ./configure --with-mit-threads=no
@end example
@node OpenBSD 2.8, BSDI, OpenBSD 2.5, BSD Notes
@node OpenBSD 2.8, BSDI, OpenBSD 2.5, OpenBSD
@subsubsection OpenBSD 2.8 Notes
Our users have reported that OpenBSD 2.8 has a threading bug which causes
......@@ -8876,7 +8857,7 @@ usage, and crashes.
This section contains notes on BSD/OS.
@node BSDI2, BSDI3, BSDI, BSD Notes
@node BSDI2, BSDI3, BSDI, BSDI
@subsubsection BSD/OS Version 2.x Notes
If you get the following error when compiling MySQL, your
......@@ -8901,7 +8882,7 @@ If you get problems with the current date in MySQL, setting the
@code{TZ} variable will probably help. @xref{Environment variables}.
@node BSDI3, BSDI4, BSDI2, BSD Notes
@node BSDI3, BSDI4, BSDI2, BSDI
@subsubsection BSD/OS Version 3.x Notes
Upgrade to BSD/OS Version 3.1. If that is not possible, install
......@@ -8942,7 +8923,7 @@ If this doesn't work and you are using @code{bash}, try switching to
@code{bash} and @code{ulimit}.
@node BSDI4, , BSDI3, BSD Notes
@node BSDI4, , BSDI3, BSDI
@subsubsection BSD/OS Version 4.x Notes
BSDI Version 4.x has some thread-related bugs. If you want to use
......@@ -9793,12 +9774,6 @@ CC=cc CXX=CC ./configure --prefix=/usr/local/mysql
If you want to use @code{gcc}, you must use @code{gcc} 2.95.2 or newer.
@menu
* OS/2:: OS/2 Notes
@end menu
@node OS/2, BeOS, Other Unix Notes, Operating System Specific Notes
@subsection OS/2 Notes
......@@ -13276,11 +13251,7 @@ start them with @code{./bin/safe_mysqld} then in most cases the only
option you need to add/change is the @code{socket} and @code{port}
argument to @code{safe_mysqld}.
@menu
* Multiple servers:: Running Multiple MySQL Servers on the Same Machine
@end menu
@xref{Multiple servers, ,Running Multiple MySQL Servers on the Same Machine}.
@node Multiple servers, , Installing many servers, Configuring MySQL
@subsection Running Multiple MySQL Servers on the Same Machine
......@@ -16457,14 +16428,6 @@ tables while you are running @code{myisamchk}. In MySQL Version 3.23
the easiest way to avoid this problem is to use @code{CHECK TABLE}
instead of @code{myisamchk} to check tables.
@menu
* myisamchk general options:: General Options for @code{myisamchk}
* myisamchk check options:: Check Options for @code{myisamchk}
* myisamchk repair options:: Repair Options for myisamchk
* myisamchk other options:: Other Options for @code{myisamchk}
@end menu
@node myisamchk general options, myisamchk check options, myisamchk syntax, Table maintenance
@subsubsection General Options for @code{myisamchk}
......@@ -17669,12 +17632,6 @@ If the thread is waiting for free disk space in a @code{write} call, the
write is aborted with an disk full error message.
@end itemize
@menu
* SHOW:: @code{SHOW} Syntax
@end menu
@node SHOW, , KILL, Database Administration
@subsection @code{SHOW} Syntax
......@@ -21961,15 +21918,6 @@ of the master's binary log is has processed. @strong{Do not} remove or
edit the file, unless you really know what you are doing. Even in that case,
it is preferred that you use @code{CHANGE MASTER TO} command.
@menu
* Replication Features:: Replication Features and Known Problems
* Replication Options:: Replication Options in my.cnf
* Replication SQL:: SQL Commands Related to Replication
* Replication FAQ:: Replication FAQ
* Replication Problems:: Troubleshooting Replication
@end menu
@node Replication Features, Replication Options, Replication HOWTO, Replication
@subsection Replication Features and Known Problems
......@@ -24923,16 +24871,6 @@ part of the rows, MySQL will use an index anyway, as it can
much more quickly find the few rows to return in the result.
@end itemize
@menu
* Indexes:: Column Indexes
* Multiple-column indexes:: Multiple-Column Indexes
* Table cache:: How MySQL Opens and Closes Tables
* Creating many tables:: Drawbacks to Creating Large Numbers of Tables in the Same Database
* Open tables:: Why So Many Open tables?
@end menu
@node Indexes, Multiple-column indexes, MySQL indexes, Optimising Database Structure
@subsection Column Indexes
......@@ -25769,13 +25707,7 @@ command when inserting an @code{AUTO_INCREMENT} value. This is mainly used
with the update log.
@end table
@menu
* SET TRANSACTION:: @code{SET TRANSACTION} Syntax
@end menu
@xref{SET TRANSACTION}.
@node Disk issues, , Optimising the Server, MySQL Optimisation
@section Disk Issues
......@@ -26316,11 +26248,6 @@ or export formats (@code{LOAD DATA INFILE}, @code{SELECT ... INTO OUTFILE}).
@cindex columns, names
@cindex aliases, names
@menu
* Name case sensitivity:: Case sensitivity in names
@end menu
Database, table, index, column, and alias names all follow the same rules in
MySQL.
......@@ -26518,12 +26445,6 @@ SELECT (@@aa:=id) AS a, (@@aa+3) AS b FROM table_name HAVING b=5;
The reason is that @code{@@aa} will not contain the value of the current
row, but the value of @code{id} for the previous accepted row.
@menu
* Comments:: Comment Syntax
* Reserved words:: Is MySQL Picky About Reserved Words?
@end menu
@node Comments, Reserved words, Variables, Language Structure
@subsection Comment Syntax
......@@ -32709,16 +32630,6 @@ exist.
@cindex @code{mysqladmin}
You can also drop databases with @code{mysqladmin}. @xref{Client-Side Scripts}.
@menu
* CREATE TABLE:: @code{CREATE TABLE} Syntax
* ALTER TABLE:: @code{ALTER TABLE} Syntax
* RENAME TABLE:: @code{RENAME TABLE} Syntax
* DROP TABLE:: @code{DROP TABLE} Syntax
* CREATE INDEX:: @code{CREATE INDEX} Syntax
* DROP INDEX:: @code{DROP INDEX} Syntax
@end menu
@node CREATE TABLE, ALTER TABLE, DROP DATABASE, Data Definition
@subsection @code{CREATE TABLE} Syntax
......@@ -41356,14 +41267,6 @@ example.
You can test for an error by calling @code{mysql_error()} or
@code{mysql_errno()}.
@cindex queries, C API results
@menu
* Query results:: What Results Can I Get From a Query?
* Getting unique ID:: How Can I Get the Unique ID for the Last Inserted Row?
* C API linking problems:: Problems Linking with the C API
@end menu
@node Query results, Getting unique ID, NULL mysql_store_result, C API problems
@subsubsection What Results Can I Get From a Query?
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7