Commit 01e84598 authored by unknown's avatar unknown
Browse files

Merge from 4.1 

Archive fix by Ingo.
Innodb compile fix by Monty.


configure.in:
  Auto merged
innobase/include/univ.i:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  Merged Montys fix.
parents a496ad3f fee6edd9

BUILD/SETUP.sh

100644 → 100755
+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ Any other options will be passed directly to configure. 
Note:  this script is intended for internal use by MySQL developers.

EOF

  --with-debug=full ) full_debug="=full"; shift ;;

  * ) break ;;

  * )

    echo "Unknown option '$1'"

    exit 1

    break ;;

  esac

done
@@ -62,6 +65,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" 
reckless_cflags="-O3 -fomit-frame-pointer "



debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

debug_extra_cflags="-O1 -Wuninitialized"



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

amd64_cxxflags="-DBIG_TABLES"
@@ -80,7 +84,7 @@ local_infile_configs="--enable-local-infile" 
debug_configs="--with-debug$full_debug"

if [ -z "$full_debug" ]

then

	debug_cflags="$debug_cflags -O1 -Wuninitialized"

  debug_cflags="$debug_cflags $debug_extra_cflags"

fi



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

BUILD/compile-pentium64-debug

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -1678,12 +1678,12 @@ if test "$with_debug" = "yes" 
then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

innobase/include/univ.i

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ memory is read outside the allocated blocks. */ 


/* Make a non-inline debug version */



#ifdef DBUG_ON

#define UNIV_DEBUG

#endif /* DBUG_ON */



/*

#define UNIV_DEBUG

#define UNIV_MEM_DEBUG

mysql-test/t/archive.test

+1 −1
Original line number Diff line number Diff line 
#

# Simple test for archive example

# Taken fromm the select test

# Taken from the select test

#

-- source include/have_archive.inc