Fixed searching after ssl directories.

Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE


BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea:
  Delete: vio/docs/CodingStyle
BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609:
  Delete: vio/docs/COPYING.dbug
BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a:
  Delete: vio/docs/COPYING.mysql
BitKeeper/deleted/.del-README~947354991dc882f8:
  Delete: vio/docs/README
Docs/manual.texi:
  Changelog
acinclude.m4:
  Fixed searching after ssl directories.
client/Makefile.am:
  Moved openssl include to avoid problem with installed readline
include/Makefile.am:
  Install my_global.h
include/violite.h:
  Fixed that GRANT ... REQUIRE options are not forgot when doing new grant
libmysqld/examples/Makefile.am:
  Moved openssl include to avoid problem with installed readline
mysql-test/mysql-test-run.sh:
  Improved 'which' handling to give error if command is not found
mysys/mf_fn_ext.c:
  Changed fn_ext to point at first '.' after directory.
sql/Makefile.am:
  More comments
sql/lex.h:
  Added NONE as keyword
sql/log.cc:
  FLUSH LOGS removed numerical extension for all future update logs.
  Simple code cleanup
sql/mysqld.cc:
  Fixed the --help reports right values for --datadir and --bind-address
  --log-binary=a.b.c now properly strips of .b.c
  Removed option --skip-external-locking (not needed as this is automatic)
sql/repl_failsafe.cc:
  Moved some common THD initalization to store_globals()
sql/slave.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.h:
  Updated function prototypes
sql/sql_base.cc:
  Added comment
sql/sql_class.cc:
  Moved openssl include to avoid problem with installed readline.
  Changed THD::thd to make things work for main thread.
sql/sql_class.h:
  Fixed wrongly removed line (fixes compiler problem on MacOSX)
sql/sql_insert.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_lex.cc:
  Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler
sql/sql_lex.h:
  Indentation cleanup
sql/sql_parse.cc:
  Moved openssl include to avoid problem with installed readline.
  Added THD argument to acl_reload()
sql/sql_repl.h:
  Made opt_bin_logname static
sql/sql_udf.cc:
  Fix that one can DROP UDF functions that was not loaded at startup
sql/sql_yacc.yy:
  made AND optional in REQUIRE
  Added REQUIRE NONE
  Fixed that old SSL options are not forgotten when doing new GRANT.
sql/udf_example.cc:
  Improved comments

4 files changed, 0 insertions, 248 deletions

diff --git a/vio/docs/COPYING.dbug b/vio/docs/COPYING.dbug
deleted file mode 100644
index e1b6463c09b..00000000000
--- a/vio/docs/COPYING.dbug
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- *									      *
- *				   N O T I C E				      *
- *									      *
- *		      Copyright Abandoned, 1987, Fred Fish		      *
- *									      *
- *									      *
- *	This previously copyrighted work has been placed into the  public     *
- *	domain	by  the  author  and  may be freely used for any purpose,     *
- *	private or commercial.						      *
- *									      *
- *	Because of the number of inquiries I was receiving about the  use     *
- *	of this product in commercially developed works I have decided to     *
- *	simply make it public domain to further its unrestricted use.	I     *
- *	specifically  would  be  most happy to see this material become a     *
- *	part of the standard Unix distributions by AT&T and the  Berkeley     *
- *	Computer  Science  Research Group, and a standard part of the GNU     *
- *	system from the Free Software Foundation.			      *
- *									      *
- *	I would appreciate it, as a courtesy, if this notice is  left  in     *
- *	all copies and derivative works.  Thank you.			      *
- *									      *
- *	The author makes no warranty of any kind  with	respect  to  this     *
- *	product  and  explicitly disclaims any implied warranties of mer-     *
- *	chantability or fitness for any particular purpose.		      *
- *									      *
- ******************************************************************************
- */
-
diff --git a/vio/docs/COPYING.mysql b/vio/docs/COPYING.mysql
deleted file mode 100644
index c2028f07298..00000000000
--- a/vio/docs/COPYING.mysql
+++ /dev/null
@@ -1,193 +0,0 @@
-The *MySQL* server license for non Microsoft operating systems
-**************************************************************
-
-                      *MySQL FREE PUBLIC LICENSE*
-
-                      (Version 4, March 5, 1995)
-
-    Copyright (C) 1995, 1996 TcX AB & Monty Program KB & Detron HB
-
-       Stockholm SWEDEN, Helsingfors FINLAND and Uppsala SWEDEN
-
-                         All rights reserved.
-
-NOTE: This license is not the same as any of the GNU Licenses published
-by the Free Software Foundation. Its terms are substantially different
-from those of the GNU Licenses. If you are familiar with the GNU
-Licenses, please read this license with extra care.
-
-This License applies to the computer program known as "MySQL".  The
-"Program", below, refers to such program, and a "work based on the
-Program" means either the Program or any derivative work of the Program,
-as defined in the United States Copyright Act of 1976, such as a
-translation or a modification. The Program is a copyrighted work whose
-copyright is held by TcX Datakonsult AB and Monty Program KB and Detron
-HB.
-
-This License does not apply when running "MySQL" on any Microsoft
-operating system. Microsoft operating systems include all versions of
-Microsoft Windows NT and Microsoft Windows.
-
-BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
-PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
-ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
-PROGRAM OR WORKS BASED ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS
-YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
-WORKS. THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE
-TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
-
-  1. Licenses.
-
-     Licensor hereby grants you the following rights, provided that you
-     comply with all of the restrictions set forth in this License and
-     provided, further, that you distribute an unmodified copy of this
-     License with the Program:
-
-       a. You may copy and distribute literal (i.e., verbatim) copies
-          of the Program's source code as you receive it throughout the
-          world, in any medium.
-
-       b. You may modify the Program, create works based on the Program
-          and distribute copies of such throughout the world, in any
-          medium.
-
-  2. Restrictions.
-
-     This license is subject to the following restrictions:
-       a. Distribution of the Program or any work based on the Program
-          by a commercial organization to any third party is prohibited
-          if any payment is made in connection with such distribution,
-          whether directly (as in payment for a copy of the Program) or
-          indirectly (as in payment for some service related to the
-          Program, or payment for some product or service that includes
-          a copy of the Program "without charge"; these are only
-          examples, and not an exhaustive enumeration of prohibited
-          activities). However, the following methods of distribution
-          involving payment shall not in and of themselves be a
-          violation of this restriction:
-
-            A. Posting the Program on a public access information
-               storage and retrieval service for which a fee is
-               received for retrieving information (such as an on-line
-               service), provided that the fee is not content-dependent
-               (i.e., the fee would be the same for retrieving the same
-               volume of information consisting of random data).
-
-            B. Distributing the Program on a CD-ROM, provided that the
-               files containing the Program are reproduced entirely and
-               verbatim on such CD-ROM, and provided further that all
-               information on such CD-ROM be redistributable for
-               non-commercial purposes without charge.
-
-       b. Activities other than copying, distribution and modification
-          of the Program are not subject to this License and they are
-          outside its scope.  Functional use (running) of the Program
-          is not restricted, and any output produced through the use of
-          the Program is subject to this license only if its contents
-          constitute a work based on the Program (independent of having
-          been made by running the Program).
-
-       c. You must meet all of the following conditions with respect to
-          the distribution of any work based on the Program:
-            A. If you have modified the Program, you must cause your
-               work to carry prominent notices stating that you have
-               modified the Program's files and the date of any change;
-
-            B. You must cause any work that you distribute or publish,
-               that in whole or in part contains or is derived from the
-               Program or any part thereof, to be licensed as a whole
-               and at no charge to all third parties under the terms of
-               this License;
-
-            C. If the modified program normally reads commands
-               interactively when run, you must cause it, at each time
-               the modified program commences operation, to print or
-               display an announcement including an appropriate
-               copyright notice and a notice that there is no warranty
-               (or else, saying that you provide a warranty). Such
-               notice must also state that users may redistribute the
-               Program only under the conditions of this License and
-               tell the user how to view the copy of this License
-               included with the Program. (Exception: if the Program
-               itself is interactive but does not normally print such
-               an announcement, your work based on the Program is not
-               required to print an announcement.);
-
-            D. You must accompany any such work based on the Program
-               with the complete corresponding machine-readable source
-               code, delivered on a medium customarily used for
-               software interchange. The source code for a work means
-               the preferred form of the work for making modifications
-               to it.  For an executable work, complete source code
-               means all the source code for all modules it contains,
-               plus any associated interface definition files, plus the
-               scripts used to control compilation and installation of
-               the executable code. However, the source code
-               distributed need not include anything that is normally
-               distributed (in either source or binary form) with the
-               major components (compiler, kernel, and so on) of the
-               operating system on which the executable runs, unless
-               that component itself accompanies the executable code;
-
-            E. If you distribute any written or printed material at all
-               with the Program or any work based on the Program, such
-               material must include either a written copy of this
-               License, or a prominent written indication that the
-               Program or the work based on the Program is covered by
-               this License and written instructions for printing
-               and/or displaying the copy of the License on the
-               distribution medium;
-
-            F. You may not impose any further restrictions on the
-               recipient's exercise of the rights granted herein.
-
-               If distribution of executable or object code is made by
-               offering the equivalent ability to copy from a
-               designated place, then offering equivalent ability to
-               copy the source code from the same place counts as
-               distribution of the source code, even though third
-               parties are not compelled to copy the source code along
-               with the object code.
-
-  3. Reservation of Rights.
-
-     No rights are granted to the Program except as expressly set forth
-     herein. You may not copy, modify, sublicense, or distribute the
-     Program except as expressly provided under this License. Any
-     attempt otherwise to copy, modify, sublicense or distribute the
-     Program is void, and will automatically terminate your rights
-     under this License. However, parties who have received copies, or
-     rights, from you under this License will not have their licenses
-     terminated so long as such parties remain in full compliance.
-
-  4. Other Restrictions.
-
-     If the distribution and/or use of the Program is restricted in
-     certain countries for any reason, Licensor may add an explicit
-     geographical distribution limitation excluding those countries, so
-     that distribution is permitted only in or among countries not thus
-     excluded. In such case, this License incorporates the limitation
-     as if written in the body of this License.
-
-  5. Limitations.
-
-     THE PROGRAM IS PROVIDED TO YOU "AS IS," WITHOUT WARRANTY. THERE IS
-     NO WARRANTY FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED,
-     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND
-     NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE ENTIRE RISK AS TO THE
-     QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-     SERVICING, REPAIR OR CORRECTION.
-
-     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL LICENSOR, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-     REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-     DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-     THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-     BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-     PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-     THE POSSIBILITY OF SUCH DAMAGES.
-
diff --git a/vio/docs/CodingStyle b/vio/docs/CodingStyle
deleted file mode 100644
index 7231b369d18..00000000000
--- a/vio/docs/CodingStyle
+++ /dev/null
@@ -1,8 +0,0 @@
-Roughly the same as "Linux Kernel Coding Style", which is
-included in file LinuxKernelCodingStyle.
-
-Some methods are meant to be used as set/get, for example, there
-are:
-virtual bool Vio::blocking();
-virtual int Vio::blocking(bool block);
-
diff --git a/vio/docs/README b/vio/docs/README
deleted file mode 100644
index 9fb3255236f..00000000000
--- a/vio/docs/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Virtual IO library.
-IO wrappers for sockets, fd-s, SSL.
-Languages:C++
-
-This library is based on work of many others.
-They have different policies and I haven't thought up
-about resulting licence - GPL, L(essen)GPL, BSD-style, whatever.
-The licences are here for reference:
-COPYING.mysql:	MySQL licence. Some socket functions.
-COPYING.dbug:	Fred Fish's dbug library. I use it extensively ;=)
-COPYING.openssl:OpenSSL licence. SSL wrappers.
-
-At the moment there is no real 'Makefile', just config.mk/targets.mk
-and Makefile.am to build it as a module in MySQL. Therefore, there
-is currently no possibility to build it as a separate library, but
-with MySQL-s root Makefile it should just a matter of leaving
-everything else out.
-