Commit 9ce9664f authored by arjen@fred.bitbike.com's avatar arjen@fred.bitbike.com
Browse files

Change XML/DocBook output to have version #.## instead of #.##-alpha. 

Add URL reference to "Enforcing the GPL" article.
Removed duplicate SQL_BUFFER_RESULT/SQL_SMALL_RESULT texts (reported by Fournier Jocelyn).
parent 6305cda4

Docs/Support/make-docbook

+5 −1
Original line number Diff line number Diff line
@@ -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

Docs/manual.texi

+2 −15
Original line number Diff line number Diff line
@@ -1422,7 +1422,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










@@ -33183,20 +33184,6 @@ If you are not getting the results you expect from your query, please













read the @code{GROUP BY} description.















@xref{Group by functions}.



























@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