diff options
Diffstat (limited to 'Docs')
| -rwxr-xr-x | Docs/Support/colspec-fix.pl | 6 | ||||
| -rwxr-xr-x | Docs/Support/make-docbook | 6 | ||||
| -rw-r--r-- | Docs/manual.texi | 31 |
3 files changed, 14 insertions, 29 deletions
diff --git a/Docs/Support/colspec-fix.pl b/Docs/Support/colspec-fix.pl index bba0d27858f..6c64edd1441 100755 --- a/Docs/Support/colspec-fix.pl +++ b/Docs/Support/colspec-fix.pl @@ -8,10 +8,10 @@ use strict; -my $table_width = 12.75; # cm -my $gutter_width = 0.55; # 2 mm +my $table_width = 12.75; # Specify the max width of the table in cm +my $gutter_width = 0.55; # Specify the width of the gutters in cm -my $str = join '', <>; +my $str = join '', <>; # Push stdin (or file) $str =~ s{([\t ]*(<colspec colwidth=\".+?\" />\s*)+)} {&rel2abs($1)}ges; diff --git a/Docs/Support/make-docbook b/Docs/Support/make-docbook index bdca812d7ab..90c1696e92b 100755 --- a/Docs/Support/make-docbook +++ b/Docs/Support/make-docbook @@ -6,8 +6,12 @@ #create include.texi with version/port # echo "@c This file is autogenerated by the Makefile" > include.texi echo -n "@set mysql_version " >> include.texi +# grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \ +# sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi +# 2002-04-26 arjen - the below just picks #.# instead of #.#.#-alpha +# (code by mwagner - tnx) grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \ - sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi + perl -p -e 's/AM_INIT_AUTOMAKE\(mysql,\s(\d+\.\d+)\..+/$1/' >> include.texi echo -n "@set default_port " >> include.texi grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \ sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi diff --git a/Docs/manual.texi b/Docs/manual.texi index 59454ef5290..f0702ac4b2c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -231,8 +231,8 @@ security bug in @code{MySQL Server}, you should send an e-mail to @menu * Manual-info:: About This Manual -* What-is:: What Is MySQL? -* What is MySQL AB:: What Is MySQL AB? +* What-is:: What Is MySQL +* What is MySQL AB:: What Is MySQL AB * Licensing and Support:: MySQL Support and Licensing * MySQL 4.0 In A Nutshell:: MySQL 4.0 In A Nutshell * MySQL Information Sources:: MySQL Information Sources @@ -397,7 +397,7 @@ alternatives are listed within braces (@samp{@{} and @samp{@}}): @node What-is, What is MySQL AB, Manual-info, Introduction -@section What Is MySQL? +@section What Is MySQL @cindex MySQL, defined @cindex MySQL, introduction @@ -948,7 +948,7 @@ year values). @node What is MySQL AB, Licensing and Support, What-is, Introduction -@section What Is MySQL AB? +@section What Is MySQL AB @cindex MySQL AB, defined @@ -1423,7 +1423,8 @@ The @code{MySQL} software is released under the which probably is the best known @code{Open Source} license. The formal terms of the @code{GPL} license can be found at @uref{http://www.gnu.org/licenses/}. -See also @uref{http://www.gnu.org/licenses/gpl-faq.html}. +See also @uref{http://www.gnu.org/licenses/gpl-faq.html} and +@uref{http://www.gnu.org/philosophy/enforcing-gpl.html}. Since the @code{MySQL} software is released under the @code{GPL}, it may often be used for free, but for certain uses you may want @@ -12763,12 +12764,6 @@ example, @samp{x*} matches any number of @samp{x} characters, number of anything. @item -Regular expressions are case sensitive, but you can use a character class to -match both lettercases if you wish. For example, @samp{[aA]} matches -lowercase or uppercase @samp{a} and @samp{[a-zA-Z]} matches any letter in -either case. - -@item The pattern matches if it occurs anywhere in the value being tested. (SQL patterns match only if they match the entire value.) @@ -33191,20 +33186,6 @@ read the @code{GROUP BY} description. @item @cindex hints -@code{SQL_BUFFER_RESULT} will force the result to be put into a temporary -table. This will help MySQL free the table locks early and will help -in cases where it takes a long time to send the result set to the client. - -@item -@cindex hints -@code{SQL_SMALL_RESULT}, a MySQL-specific option, can be used -with @code{GROUP BY} or @code{DISTINCT} to tell the optimiser that the -result set will be small. In this case, MySQL will use fast -temporary tables to store the resulting table instead of using sorting. In -MySQL Version 3.23 this shouldn't normally be needed. - -@item -@cindex hints @code{STRAIGHT_JOIN} forces the optimiser to join the tables in the order in which they are listed in the @code{FROM} clause. You can use this to speed up a query if the optimiser joins the tables in non-optimal order. |