post-merge fix

strings and so the result string length may be calculated as

16*(trunc(string_length/16)+1).

@c FIX arjen 2002-06-21  Peter: this sentence makes no sense at all!

If the string has an incorrect length or contains invalid data for this

key, @code{AES_DECRYPT()} will return @code{NULL}, therefore you can't

rely on this to much, @code{AES_DECRYPT()} has some change to return

a non-@code{NULL} value even for an invalid key.

If @code{AES_DECRYPT()} detects invalid data or incorrect padding, it

will return @code{NULL}. However, it is possible for @code{AES_DECRYPT()}

to return a non-@code{NULL} value (possibly garbage) if the input data or

the key was invalid.

You can use the AES functions to store data in an encrypted form by

modifying your queries:

  *darwin*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      MAX_C_OPTIMIZE="-O"

      with_named_curses=""

			nisam.h heap.h merge.h my_bitmap.h\

			myisam.h myisampack.h myisammrg.h ft_global.h\

			my_dir.h mysys_err.h my_base.h \

			my_nosys.h my_alarm.h queues.h \

			my_tree.h hash.h thr_alarm.h thr_lock.h \

			t_ctype.h violite.h md5.h mysql_version.h.in

			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

			my_aes.h my_getopt.h my_tree.h hash.h thr_alarm.h \

			thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in

# mysql_version.h are generated

SUPERCLEANFILES =	mysql_version.h my_config.h

/* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

/* Declarations for getopt.

   Copyright (C) 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.

This file is part of the GNU C Library.  Its master source is NOT part of

the C library, however.  The master source lives in /gd/gnu/lib.

The GNU C Library is free software; you can redistribute it and/or

modify it under the terms of the GNU Library General Public License as

published by the Free Software Foundation; either version 2 of the

License, or (at your option) any later version.

The GNU C Library is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

Library General Public License for more details.

You should have received a copy of the GNU Library General Public

License along with the GNU C Library; see the file COPYING.LIB.  If

not, write to the Free Software Foundation, Inc., 675 Mass Ave,

Cambridge, MA 02139, USA.  */

#ifndef _GETOPT_H

#define _GETOPT_H 1

#ifdef	__cplusplus

extern "C" {

#endif

/* For communication from `getopt' to the caller.

   When `getopt' finds an option that takes an argument,

   the argument value is returned here.

   Also, when `ordering' is RETURN_IN_ORDER,

   each non-option ARGV-element is returned here.  */

extern char *optarg;

/* Index in ARGV of the next element to be scanned.

   This is used for communication to and from the caller

   and for communication between successive calls to `getopt'.

   On entry to `getopt', zero means this is the first call; initialize.

   When `getopt' returns EOF, this is the index of the first of the

   non-option elements that the caller should itself scan.

   Otherwise, `optind' communicates from one call to the next

   how much of ARGV has been scanned so far.  */

extern int optind;

/* Callers store zero here to inhibit the error message `getopt' prints

   for unrecognized options.  */

extern int opterr;

/* Set to an option character which was unrecognized.  */

extern int optopt;

/* Describe the long-named options requested by the application.

   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector

   of `struct option' terminated by an element containing a name which is

   zero.

   The field `has_arg' is:

   no_argument		(or 0) if the option does not take an argument,

   required_argument	(or 1) if the option requires an argument,

   optional_argument	(or 2) if the option takes an optional argument.

   If the field `flag' is not NULL, it points to a variable that is set

   to the value given in the field `val' when the option is found, but

   left unchanged if the option is not found.

   To have a long-named option do something other than set an `int' to

   a compiled-in constant, such as set a value from `optarg', set the

   option's `flag' field to zero and its `val' field to a nonzero

   value (the equivalent single-letter option character, if there is

   one).  For long options that have a zero `flag' field, `getopt'

   returns the contents of the `val' field.  */

struct option

{

#if defined (__STDC__) && __STDC__ || defined(__cplusplus)

  const char *name;

#else

  char *name;

#endif

  /* has_arg can't be an enum because some compilers complain about

     type mismatches in all the code that assumes it is an int.  */

  int has_arg;

  int *flag;

  int val;

};

/* Names for the values of the `has_arg' field of `struct option'.  */

#define no_argument		0

#define required_argument	1

#define optional_argument	2

#if ( defined (__STDC__) && __STDC__ ) || defined(__cplusplus) || defined(MSDOS)

#ifdef __EMX__

int getopt (int, char **, __const__ char *);

#elif defined( __GNU_LIBRARY__)

/* Many other libraries have conflicting prototypes for getopt, with

   differences in the consts, in stdlib.h.  To avoid compilation

   errors, only prototype getopt for the GNU C library.  */

extern int getopt (int argc, char *const *argv, const char *shortopts);

#else /* not __GNU_LIBRARY__ */

extern int getopt (int argc, char *const *argv, const char *optstring);

#endif /* __GNU_LIBRARY__ */

extern int getopt_long (int argc, char *const *argv, const char *shortopts,

			const struct option *longopts, int *longind);

extern int getopt_long_only (int argc, char *const *argv,

			     const char *shortopts,

			     const struct option *longopts, int *longind);

/* Internal only.  Users should not call this directly.  */

extern int _getopt_internal (int argc, char *const *argv,

			     const char *shortopts,

			     const struct option *longopts, int *longind,

			     int long_only);

#else /* not __STDC__ */

extern int getopt ();

extern int getopt_long ();

extern int getopt_long_only ();

extern int _getopt_internal ();

#endif /* __STDC__ */

#ifdef	__cplusplus

}

#endif

#endif /* _GETOPT_H */

   "Unpack file packed with myisampack.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"verbose", 'v',

   "Print more information. This can be used with --describe and --check. Use many -v for more verbosity!",

   "Print more information. This can be used with --description and --check. Use many -v for more verbosity!",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"version", 'V',

   "Print version and exit.",

  -s, --silent	      Only print errors.  One can use two -s to make\n\

		      myisamchk very silent\n\

  -v, --verbose       Print more information. This can be used with\n\

                      --describe and --check. Use many -v for more verbosity!\n\

                      --description and --check. Use many -v for more verbosity!\n\

  -V, --version       Print version and exit.\n\

  -w, --wait          Wait if table is locked.\n");

  puts("Other actions:\n\

  -a, --analyze	      Analyze distribution of keys. Will make some joins in\n\

		      MySQL faster.  You can check the calculated distribution\n\

		      by using '--describe --verbose table_name'.\n\

		      by using '--description --verbose table_name'.\n\

  -d, --description   Prints some information about table.\n\

  -A, --set-auto-increment[=value]\n\

		      Force auto_increment to start at this or higher value\n\