Commit 8c7852ba authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
parents 477a4f5c a796fc48

config/ac-macros/yassl.m4

+6 −6
Original line number Diff line number Diff line
@@ -16,28 +16,28 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a"

    yassl_includes="-I\$(top_srcdir)/extra/yassl/include"

    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la"

    AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])

    AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])

    # System specific checks

    yassl_integer_extra_cxxflags=""

    case $host_cpu--$CXX_VERSION in

        sparc*--*Sun*C++*5.6*)

	# Disable inlining when compiling taocrypt/src/integer.cpp

	yassl_integer_extra_cxxflags="+d"

        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp])

	# Disable inlining when compiling taocrypt/src/

	yassl_taocrypt_extra_cxxflags="+d"

        AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])

        ;;

    esac

    AC_SUBST([yassl_integer_extra_cxxflags])

    AC_SUBST([yassl_taocrypt_extra_cxxflags])



  else

    yassl_dir=""

    AC_MSG_RESULT(no)

  fi

  AC_SUBST(yassl_libs)

  AC_SUBST(yassl_libs_with_path)

  AC_SUBST(yassl_includes)

  AC_SUBST(yassl_dir)

  AC_SUBST(yassl_libs_with_path)

  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

])

extra/innochecksum.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#define _LARGEFILE_SOURCE

#define _LARGEFILE64_SOURCE



#define _XOPEN_SOURCE /* needed to include getopt.h on some platforms. */



#include <stdio.h>

#include <stdlib.h>

#include <time.h>

extra/yassl/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../mySTL



noinst_LIBRARIES = libyassl.a

libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)

extra/yassl/taocrypt/src/Makefile.am

+4 −8
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL



noinst_LIBRARIES = libtaoint.a libtaocrypt.a

noinst_LTLIBRARIES = libtaocrypt.la



libtaoint_a_SOURCES = integer.cpp

libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@



libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

	coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \

	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \

	template_instnt.cpp

libtaocrypt_a_LIBADD = libtaoint_a-integer.o

	template_instnt.cpp integer.cpp

libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C



EXTRA_DIST = $(wildcard ../include/*.hpp)
 
AM_CXXFLAGS = -DYASSL_PURE_C

include/my_base.h

+42 −9
Original line number Diff line number Diff line
@@ -256,14 +256,47 @@ enum ha_base_keytype { 
#define HA_CREATE_CHECKSUM	8

#define HA_CREATE_DELAY_KEY_WRITE 64



	/* Bits in flag to _status */

/*

  The following flags (OR-ed) are passed to handler::info() method.

  The method copies misc handler information out of the storage engine

  to data structures accessible from MySQL



  Same flags are also passed down to mi_status, myrg_status, etc.

*/



#define HA_STATUS_POS		1		/* Return position */

#define HA_STATUS_NO_LOCK	2		/* Don't use external lock */

#define HA_STATUS_TIME		4		/* Return update time */

#define HA_STATUS_CONST		8		/* Return constants values */

/* this one is not used */

#define HA_STATUS_POS            1

/*

  assuming the table keeps shared actual copy of the 'info' and

  local, possibly outdated copy, the following flag means that

  it should not try to get the actual data (locking the shared structure)

  slightly outdated version will suffice

*/

#define HA_STATUS_NO_LOCK        2

/* update the time of the last modification (in handler::update_time) */

#define HA_STATUS_TIME           4

/*

  update the 'constant' part of the info:

  handler::max_data_file_length, max_index_file_length, create_time

  sortkey, ref_length, block_size, data_file_name, index_file_name.

  handler::table->s->keys_in_use, keys_for_keyread, rec_per_key

*/

#define HA_STATUS_CONST          8

/*

  update the 'variable' part of the info:

  handler::records, deleted, data_file_length, index_file_length,

  delete_length, check_time, mean_rec_length

*/

#define HA_STATUS_VARIABLE      16

/*

  get the information about the key that caused last duplicate value error

  update handler::errkey and handler::dupp_ref

  see handler::get_dup_key()

*/

#define HA_STATUS_ERRKEY        32

/*

  update handler::auto_increment_value

*/

#define HA_STATUS_AUTO          64



	/* Errorcodes given by functions */