Commit a5a4f767 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
parents 354e7593 812a82ed

acinclude.m4

+5 −3
Original line number Diff line number Diff line
@@ -311,8 +311,9 @@ case $SYSTEM_TYPE in 
        ;;

      *)

        # Just to be safe, we test for ".so" anyway

	eval shrexts=\"$shrext_cmds\"

        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \

                   -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \

                   -f "$mysql_zlib_dir/lib/libz$shrexts" \) \

                -a -f "$mysql_zlib_dir/include/zlib.h"; then

          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"

          ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
@@ -967,6 +968,7 @@ AC_DEFUN([MYSQL_CHECK_VIO], [ 
AC_DEFUN([MYSQL_FIND_OPENSSL], [

  incs="$1"

  libs="$2"

  eval shrexts=\"$shrext_cmds\"

  case "$incs---$libs" in

    ---)

      for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
@@ -981,7 +983,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \

/usr/freeware/lib32 /usr/local/lib/ ; do

      # Just to be safe, we test for ".so" anyway

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrexts ; then

        OPENSSL_LIB=$d

      fi

      done
@@ -994,7 +996,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
        OPENSSL_INCLUDE=-I$incs

      fi

      # Just to be safe, we test for ".so" anyway

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f "$libs/libssl$shrexts" ; then

        OPENSSL_LIB=$libs

      fi

      ;;

configure.in

+4 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.19)

AM_INIT_AUTOMAKE(mysql, 4.1.20)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=19

NDB_VERSION_BUILD=20

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -827,9 +827,8 @@ AC_CHECK_FUNC(yp_get_default_domain, , 
AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))

# This may get things to compile even if bind-8 is installed

AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))

# For crypt() on Linux

AC_CHECK_LIB(crypt, crypt)

AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 

# Check if crypt() exists in libc or libcrypt, sets LIBS if needed

AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))



# For sem_xxx functions on Solaris 2.6

AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))

include/config-win.h

+7 −2
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ functions */ 
#define _WIN32_WINNT     0x0500

#endif



#if defined(_MSC_VER) && _MSC_VER >= 1400

/* Avoid endless warnings about sprintf() etc. being unsafe. */

#define _CRT_SECURE_NO_DEPRECATE 1

#endif



#include <sys/locking.h>

#include <windows.h>

#include <math.h>			/* Because of rint() */
@@ -195,7 +200,7 @@ typedef uint rf_SetTimer; 
#define my_sigset(A,B) signal((A),(B))

#define finite(A) _finite(A)

#define sleep(A)  Sleep((A)*1000)

#define popen(A) popen(A,B) _popen((A),(B))

#define popen(A,B) _popen((A),(B))

#define pclose(A) _pclose(A)



#ifndef __BORLANDC__
@@ -385,7 +390,7 @@ inline double ulonglong2double(ulonglong value) 
#else

#define MYSQL_DEFAULT_CHARSET_NAME "latin1"

#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"

#enfif

#endif



#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1

innobase/include/dict0dict.ic

+0 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ dict_table_get_n_user_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols - DATA_N_SYS_COLS);

}
@@ -127,7 +126,6 @@ dict_table_get_n_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols);

}

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ sub command_line_setup () { 
    $glob_use_embedded_server= 1;

    push(@glob_test_mode, "embedded");

    $opt_skip_rpl= 1;              # We never run replication with embedded

    $opt_skip_ndbcluster= 1;



    if ( $opt_extern )

    {