Commit eba4984e authored by kent.boortz@sun.com's avatar kent.boortz@sun.com Committed by Build Team
Browse files

Merge from mysql-5.1.29-rc-release

parents fac7b57d d8e9fef0

BUILD/compile-dist

+25 −8
Original line number Diff line number Diff line
@@ -13,34 +13,51 @@ path=`dirname $0` 


# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

  CXX=gcc

  # Set some required compile options

  if test -z "$CXXFLAGS" ; then

    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

    CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

  fi

fi



if test -z "$CC" ; then

  export CC=gcc

  CC=gcc

fi





# Use ccache, if available

if ccache -V > /dev/null 2>&1

then

  if ! (echo "$CC" | grep "ccache" > /dev/null)

  if echo "$CC" | grep "ccache" > /dev/null

  then

    export CC="ccache $CC"

    :

  else

    CC="ccache $CC"

  fi

  if ! (echo "$CXX" | grep "ccache" > /dev/null)

  if echo "$CXX" | grep "ccache" > /dev/null

  then

    export CXX="ccache $CXX"

    :

  else

    CXX="ccache $CXX"

  fi

fi



if test -z "$MAKE"

then

  if gmake -v > /dev/null 2>&1

  then

    MAKE="gmake"

  else

    MAKE="make"

  fi

fi



export CC CXX MAKE



# Make sure to enable all features that affect "make dist"

# Remember that configure restricts the man pages to the configured features !

./configure \

  --with-embedded-server \

  --with-ndbcluster

make
 
$MAKE

configure.in

+37 −27
Original line number Diff line number Diff line
@@ -405,12 +405,15 @@ dnl Find paths to some shell programs 
AC_PATH_PROG(LN, ln, ln)

# This must be able to take a -f flag like normal unix ln.

AC_PATH_PROG(LN_CP_F, ln, ln)

if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then

case $SYSTEM_TYPE in

  *netware*) ;;

  *)

    # If ln -f does not exists use -s (AFS systems)

    if test -n "$LN_CP_F"; then

      LN_CP_F="$LN_CP_F -s"

    fi

fi

    ;;

esac



AC_PATH_PROG(MV, mv, mv)

AC_PATH_PROG(RM, rm, rm)
@@ -1642,14 +1645,16 @@ else 
  OPTIMIZE_CXXFLAGS="-O"

fi



if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then

case $SYSTEM_TYPE in

  *netware*)

    DEBUG_CFLAGS="-g -DDEBUG -sym internal,codeview4"

    DEBUG_CXXFLAGS="-g -DDEBUG -sym internal,codeview4"

    DEBUG_OPTIMIZE_CC="-DDEBUG"

    DEBUG_OPTIMIZE_CXX="-DDEBUG"

    OPTIMIZE_CFLAGS="-O3 -DNDEBUG"

    OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG"

fi

    ;;

esac



# If the user specified CFLAGS, we won't add any optimizations

if test -n "$SAVE_CFLAGS"
@@ -1915,7 +1920,9 @@ MYSQL_TZNAME 
# Do the c++ compiler have a bool type

MYSQL_CXX_BOOL

# Check some common bugs with gcc 2.8.# on sparc

if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then

case $SYSTEM_TYPE in

  *netware*) ;;

  *)

    MYSQL_CHECK_LONGLONG_TO_FLOAT

    if test "$ac_cv_conv_longlong_to_float" != "yes"

    then
@@ -1923,7 +1930,8 @@ then 
 If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try

    again])

    fi

fi

    ;;

esac

AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])

AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])

AC_CHECK_TYPES([u_int32_t])
@@ -2549,11 +2557,12 @@ readline_h_ln_cmd="" 
readline_link=""

want_to_use_readline="no"



if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null

then

case $SYSTEM_TYPE in

  *netware*)

    # For NetWare, do not need readline

    echo "Skipping readline"

else

    ;;

  *)

    if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]

    then

	readline_topdir="cmd-line-utils"
@@ -2606,7 +2615,8 @@ else 
	      be built with libreadline. Please use --with-libedit to use

	      the bundled version of libedit instead.])

    fi

fi

    ;;

esac



AC_SUBST(readline_dir)

AC_SUBST(readline_topdir)

mysql-test/suite/funcs_1/r/ndb_storedproc.result

deleted100644 → 0
+0 −23607

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/t/ndb_storedproc.test

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#### suite/funcs_1/t/ndb_storedproc.test

#



# This test cannot be used for the embedded server because we check here

# privileges.

--source include/not_embedded.inc



--source include/have_ndb.inc

let $engine_type= ndb;



--source suite/funcs_1/storedproc/load_sp_tb.inc



--source suite/funcs_1/storedproc/storedproc_master.inc

mysql-test/suite/parts/t/partition_alter2_ndb.test

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
################################################################################

# t/partition_alter2_ndb.test                                                  #

#                                                                              #

# Purpose:                                                                     #

#  Tests around Alter column used in partitioning function                     #

#        NDB branch                                                            #

#                                                                              #

#------------------------------------------------------------------------------#

# Original Author: mleich                                                      #

# Original Date: 2006-03-05                                                    #

# Change Author:                                                               #

# Change Date:                                                                 #

# Change:                                                                      #

################################################################################



#

# NOTE: PLEASE DO NOT ADD NOT NDB SPECIFIC TESTCASES HERE !

#       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN

#       THE SOURCED FILES ONLY.

#

# Please read the README at the end of inc/partition.pre before changing

# any of the variables.

#



#------------------------------------------------------------------------------#

# General not engine specific settings and requirements



##### Options, for debugging support #####

let $debug= 0;

let $with_partitioning= 1;



##### Option, for displaying files #####

let $ls= 1;



##### Number of rows for the INSERT/UPDATE/DELETE/SELECT experiments #####

#     on partioned tables

SET @max_row = 20;



##### Execute more tests                                             #####

let $more_trigger_tests= 0;

let $more_pk_ui_tests= 0;



# The server must support partitioning. But NDB is partitioned from the start.

# Thats why the next line is set to comment.

# --source include/have_partition.inc



#------------------------------------------------------------------------------#

# Engine specific settings and requirements



##### Storage engine to be tested

--source include/have_ndb.inc

let $engine= 'ndbcluster';

connection default;



# range, list and hash partitioning in ndb requires new_mode

--disable_query_log

set new=on;

--enable_query_log

##### Execute the test of "table" files

# NDB has no files per PK, UI, ...

let $do_file_tests= 0;



##### Execute PRIMARY KEY tests                                      #####

# AFAIK NDB is always partitioned using the explicit defined PRIMARY KEY

#       or uses an internal one.

let $do_pk_tests= 1;



##### Assign a big number smaller than the maximum value for partitions  #####

#     and smaller than the maximum value of SIGNED INTEGER

# The NDB handler only supports 32 bit integers in VALUES

#     2147483647 seems to be too big.

let $MAX_VALUE= (2147483646);



# Generate the prerequisites ($variables, @variables, tables) needed

--source suite/parts/inc/partition.pre



##### Workarounds for known open engine specific bugs

#     none



#------------------------------------------------------------------------------#

# Execute the tests to be applied to all storage engines

--source suite/parts/inc/partition_alter2.inc



#------------------------------------------------------------------------------#

# Execute storage engine specific tests



#------------------------------------------------------------------------------#

# Cleanup

--source suite/parts/inc/partition_cleanup.inc